StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into patch-6

Browse Source
This commit is contained in:
Teebonne 2022-12-06 10:09:24 +00:00 committed by GitHub
commit 45eadf5674
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 /// constexpr max
/// </summary> /// </summary>
template <typename NumberL, typename NumberR> 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; return (lval < rval) ? rval : lval;
} }
@ -60,7 +60,7 @@ constexpr typename std::common_type<NumberL, NumberR>::type max(NumberL lval, Nu
/// constexpr min /// constexpr min
/// </summary> /// </summary>
template <typename NumberL, typename NumberR> 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; return (lval < rval) ? lval : rval;
} }