From c86e1508a348c248cefa8d0d00135ac29423f62c Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Mon, 29 Feb 2016 13:59:11 +0100 Subject: [PATCH] Fix renaming of max/min -> maximum/minimum --- lib/ProgramOptions2/Parameters.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/ProgramOptions2/Parameters.h b/lib/ProgramOptions2/Parameters.h index 5bec61a9a5..c10217842e 100644 --- a/lib/ProgramOptions2/Parameters.h +++ b/lib/ProgramOptions2/Parameters.h @@ -208,9 +208,10 @@ struct UInt64Parameter : public NumericParameter { template struct BoundedParameter : public T { - BoundedParameter(typename T::ValueType* ptr, typename T::ValueType min, - typename T::ValueType max) - : T(ptr), minimum(min), maximum(max) {} + BoundedParameter(typename T::ValueType* ptr, + typename T::ValueType minimum, + typename T::ValueType maximum) + : T(ptr), minimum(minimum), maximum(maximum) {} std::string set(std::string const& value) override { try { @@ -224,8 +225,8 @@ struct BoundedParameter : public T { } catch (...) { return "invalid numeric value"; } - return "number out of allowed range (" + std::to_string(min) + " - " + - std::to_string(max) + ")"; + return "number out of allowed range (" + std::to_string(minimum) + " - " + + std::to_string(maximum) + ")"; } typename T::ValueType minimum;