External/cxxopts
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix min/max defined macros (#152)

Browse Source 
Windows is broken and defines `min` and `max` as a macro, adding parentheses stops them from being expanded.
This commit is contained in:
舒俊杰 2018-12-20 04:57:22 +08:00 committed by jarro2783
parent 287d1e39e0
commit 5950d78558
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/cxxopts.hpp
View File

@ -485,14 +485,14 @@ namespace cxxopts
{ {
if (negative) if (negative)
{ {
if (u > static_cast<U>(-std::numeric_limits<T>::min())) if (u > static_cast<U>(-(std::numeric_limits<T>::min)()))
{ {
throw argument_incorrect_type(text); throw argument_incorrect_type(text);
} }
} }
else else
{ {
if (u > static_cast<U>(std::numeric_limits<T>::max())) if (u > static_cast<U>((std::numeric_limits<T>::max)()))
{ {
throw argument_incorrect_type(text); throw argument_incorrect_type(text);
} }
@ -553,7 +553,7 @@ namespace cxxopts
using US = typename std::make_unsigned<T>::type; using US = typename std::make_unsigned<T>::type;
constexpr auto umax = std::numeric_limits<US>::max(); constexpr auto umax = (std::numeric_limits<US>::max)();
constexpr bool is_signed = std::numeric_limits<T>::is_signed; constexpr bool is_signed = std::numeric_limits<T>::is_signed;
const bool negative = match.length(1) > 0; const bool negative = match.length(1) > 0;
const uint8_t base = match.length(2) > 0 ? 16 : 10; const uint8_t base = match.length(2) > 0 ? 16 : 10;
@ -1945,11 +1945,11 @@ Options::help_one_group(const std::string& g) const
} }
auto s = format_option(o); auto s = format_option(o);
longest = std::max(longest, stringLength(s)); longest = (std::max)(longest, stringLength(s));
format.push_back(std::make_pair(s, String())); format.push_back(std::make_pair(s, String()));
} }
longest = std::min(longest, static_cast<size_t>(OPTION_LONGEST)); longest = (std::min)(longest, static_cast<size_t>(OPTION_LONGEST));
//widest allowed description //widest allowed description
auto allowed = size_t{76} - longest - OPTION_DESC_GAP; auto allowed = size_t{76} - longest - OPTION_DESC_GAP;