boost/log
2
0
Fork 0
mirror of https://github.com/boostorg/log.git synced 2026-02-01 08:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Added workarounds for min/max macros to remove the warning from the inspect tool.

Browse Source
This commit is contained in:
Andrey Semashev
2017-07-07 01:57:38 +03:00
parent d6d29f5f6c
commit bba0b77a18
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/code_conversion.cpp
View File

@@ -73,7 +73,7 @@ inline std::size_t code_convert(const SourceCharT* begin, const SourceCharT* end
const SourceCharT* const original_begin = begin;
state_type state = state_type();
std::size_t buf_size = std::min(max_size, sizeof(converted_buffer) / sizeof(*converted_buffer));
std::size_t buf_size = (std::min)(max_size, sizeof(converted_buffer) / sizeof(*converted_buffer));
while (begin != end && buf_size > 0u)
{
TargetCharT* dest = converted_buffer;
@@ -97,7 +97,7 @@ inline std::size_t code_convert(const SourceCharT* begin, const SourceCharT* end
case std::codecvt_base::noconv:
{
// Not possible, unless both character types are actually equivalent
const std::size_t size = std::min(max_size, static_cast< std::size_t >(end - begin));
const std::size_t size = (std::min)(max_size, static_cast< std::size_t >(end - begin));
converted.append(begin, begin + size);
begin += size;
max_size -= size;
@@ -130,7 +130,7 @@ inline std::size_t code_convert(const SourceCharT* begin, const SourceCharT* end
BOOST_LOG_THROW_DESCR(conversion_error, "Could not convert character encoding");
}
buf_size = std::min(max_size, sizeof(converted_buffer) / sizeof(*converted_buffer));
buf_size = (std::min)(max_size, sizeof(converted_buffer) / sizeof(*converted_buffer));
}
done: