mirror of https://github.com/tfussell/xlnt
Disambiguation from other max/min functions
Disambiguation from other max/min functionspull/667/head
parent
fbae8cd6c1
commit
73f518ca98
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue