StarMirror
/
xlnt
mirror of https://github.com/tfussell/xlnt
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #667 from Teebonne/patch-7 

Disambiguation from other max/min functions
master
Thomas Fussell 2022-12-03 11:45:01 -06:00 committed by GitHub
parent 80a692725c 9b752b7e0b
commit 297b331435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/xlnt/utils/numeric.hpp
View File

@ -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;
}