Merge pull request #667 from Teebonne/patch-7

Disambiguation from other max/min functions
tfussell · Dec 3, 2022 · 297b331 · 297b331
2 parents 80a6927 + 9b752b7
commit 297b331
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/xlnt/utils/numeric.hpp b/include/xlnt/utils/numeric.hpp
@@ -51,7 +51,7 @@ constexpr Number abs(Number val)
 /// constexpr max
 /// </summary>
 template <typename NumberL, typename NumberR>
-constexpr typename std::common_type<NumberL, NumberR>::type max(NumberL lval, NumberR rval)
+constexpr typename std::common_type<NumberL, NumberR>::type (max)(NumberL lval, NumberR rval)
 {
     return (lval < rval) ? rval : lval;
 }
@@ -60,7 +60,7 @@ constexpr typename std::common_type<NumberL, NumberR>::type max(NumberL lval, Nu
 /// constexpr min
 /// </summary>
 template <typename NumberL, typename NumberR>
-constexpr typename std::common_type<NumberL, NumberR>::type min(NumberL lval, NumberR rval)
+constexpr typename std::common_type<NumberL, NumberR>::type (min)(NumberL lval, NumberR rval)
 {
     return (lval < rval) ? lval : rval;
 }