zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-18 02:08:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: workaround for windows.h that defines min/max

Browse Source 
related to #123
This commit is contained in:
ToruNiina
2020-07-10 15:07:13 +09:00
parent 9633e5fe5a
commit 761e576991
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
toml/region.hpp
View File

@@ -498,7 +498,7 @@ inline std::string format_underline(const std::string& message,
{ {
// invalid // invalid
// ~~~~~~~ // ~~~~~~~
const auto underline_len = std::min(reg->size(), reg->line().size()); const auto underline_len = (std::min)(reg->size(), reg->line().size());
retval << color::bold << color::red retval << color::bold << color::red
<< make_string(underline_len, '~') << color::reset; << make_string(underline_len, '~') << color::reset;
} }

4
toml/serializer.hpp
View File

@@ -555,7 +555,7 @@ struct serializer
for(const auto& item : v) for(const auto& item : v)
{ {
if(is_first) {is_first = false;} else {token += ',';} if(is_first) {is_first = false;} else {token += ',';}
token += visit(serializer(std::numeric_limits<std::size_t>::max(), token += visit(serializer((std::numeric_limits<std::size_t>::max)(),
this->float_prec_, true), item); this->float_prec_, true), item);
} }
token += ']'; token += ']';
@@ -575,7 +575,7 @@ struct serializer
if(is_first) {is_first = false;} else {token += ',';} if(is_first) {is_first = false;} else {token += ',';}
token += format_key(kv.first); token += format_key(kv.first);
token += '='; token += '=';
token += visit(serializer(std::numeric_limits<std::size_t>::max(), token += visit(serializer((std::numeric_limits<std::size_t>::max)(),
this->float_prec_, true), kv.second); this->float_prec_, true), kv.second);
} }
token += '}'; token += '}';