mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-05-02 13:43:52 +00:00
Code Issues Releases Wiki Activity

fixes potential conflict with some windows macro redefinitions of min and max in the validators. (#642)

Browse Source
This commit is contained in:
Philip Top 2021-09-23 16:55:33 -07:00 committed by GitHub
parent c1e2ab4465
commit 4101964033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/CLI/Validators.hpp
View File

@ -467,35 +467,35 @@ class Range : public Validator {
/// Note that the constructor is templated, but the struct is not, so C++17 is not /// Note that the constructor is templated, but the struct is not, so C++17 is not
/// needed to provide nice syntax for Range(a,b). /// needed to provide nice syntax for Range(a,b).
template <typename T> template <typename T>
Range(T min, T max, const std::string &validator_name = std::string{}) : Validator(validator_name) { Range(T min_val, T max_val, const std::string &validator_name = std::string{}) : Validator(validator_name) {
if(validator_name.empty()) { if(validator_name.empty()) {
std::stringstream out; std::stringstream out;
out << detail::type_name<T>() << " in [" << min << " - " << max << "]"; out << detail::type_name<T>() << " in [" << min_val << " - " << max_val << "]";
description(out.str()); description(out.str());
} }
func_ = [min, max](std::string &input) { func_ = [min_val, max_val](std::string &input) {
T val; T val;
bool converted = detail::lexical_cast(input, val); bool converted = detail::lexical_cast(input, val);
if((!converted) || (val < min || val > max)) if((!converted) || (val < min_val || val > max_val))
return std::string("Value ") + input + " not in range " + std::to_string(min) + " to " + return std::string("Value ") + input + " not in range " + std::to_string(min_val) + " to " +
std::to_string(max); std::to_string(max_val);
return std::string(); return std::string{};
}; };
} }
/// Range of one value is 0 to value /// Range of one value is 0 to value
template <typename T> template <typename T>
explicit Range(T max, const std::string &validator_name = std::string{}) explicit Range(T max_val, const std::string &validator_name = std::string{})
: Range(static_cast<T>(0), max, validator_name) {} : Range(static_cast<T>(0), max_val, validator_name) {}
}; };
/// Check for a non negative number /// Check for a non negative number
const Range NonNegativeNumber(std::numeric_limits<double>::max(), "NONNEGATIVE"); const Range NonNegativeNumber((std::numeric_limits<double>::max)(), "NONNEGATIVE");
/// Check for a positive valued number (val>0.0), min() her is the smallest positive number /// Check for a positive valued number (val>0.0), min() her is the smallest positive number
const Range PositiveNumber(std::numeric_limits<double>::min(), std::numeric_limits<double>::max(), "POSITIVE"); const Range PositiveNumber((std::numeric_limits<double>::min)(), (std::numeric_limits<double>::max)(), "POSITIVE");
/// Produce a bounded range (factory). Min and max are inclusive. /// Produce a bounded range (factory). Min and max are inclusive.
class Bound : public Validator { class Bound : public Validator {
@ -504,28 +504,28 @@ class Bound : public Validator {
/// ///
/// Note that the constructor is templated, but the struct is not, so C++17 is not /// Note that the constructor is templated, but the struct is not, so C++17 is not
/// needed to provide nice syntax for Range(a,b). /// needed to provide nice syntax for Range(a,b).
template <typename T> Bound(T min, T max) { template <typename T> Bound(T min_val, T max_val) {
std::stringstream out; std::stringstream out;
out << detail::type_name<T>() << " bounded to [" << min << " - " << max << "]"; out << detail::type_name<T>() << " bounded to [" << min_val << " - " << max_val << "]";
description(out.str()); description(out.str());
func_ = [min, max](std::string &input) { func_ = [min_val, max_val](std::string &input) {
T val; T val;
bool converted = detail::lexical_cast(input, val); bool converted = detail::lexical_cast(input, val);
if(!converted) { if(!converted) {
return std::string("Value ") + input + " could not be converted"; return std::string("Value ") + input + " could not be converted";
} }
if(val < min) if(val < min_val)
input = detail::to_string(min); input = detail::to_string(min_val);
else if(val > max) else if(val > max_val)
input = detail::to_string(max); input = detail::to_string(max_val);
return std::string{}; return std::string{};
}; };
} }
/// Range of one value is 0 to value /// Range of one value is 0 to value
template <typename T> explicit Bound(T max) : Bound(static_cast<T>(0), max) {} template <typename T> explicit Bound(T max_val) : Bound(static_cast<T>(0), max_val) {}
}; };
namespace detail { namespace detail {