Skip to content

C
capnproto
Commit 2bbe35e2 authored by Harris Hancock's avatar Harris Hancock
Browse files
Options

Allow min and max to be constexpr

parent 04b15eda
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
c++/src/kj/common.h
View file @ 2bbe35e2
...@@ -472,7 +472,7 @@ using MinType = typename MinType_<T, U, sizeof(T) <= sizeof(U)>::Type; ...@@ -472,7 +472,7 @@ using MinType = typename MinType_<T, U, sizeof(T) <= sizeof(U)>::Type;
// Resolves to the smaller of the two input types. // Resolves to the smaller of the two input types.
template <typename T, typename U> template <typename T, typename U>
inline KJ_CONSTEXPR() auto min(T&& a, U&& b) -> MinType<Decay<T>, Decay<U>> { inline constexpr auto min(T&& a, U&& b) -> MinType<Decay<T>, Decay<U>> {
return a < b ? MinType<Decay<T>, Decay<U>>(a) : MinType<Decay<T>, Decay<U>>(b); return a < b ? MinType<Decay<T>, Decay<U>>(a) : MinType<Decay<T>, Decay<U>>(b);
} }
...@@ -485,7 +485,7 @@ using MaxType = typename MaxType_<T, U, sizeof(T) >= sizeof(U)>::Type; ...@@ -485,7 +485,7 @@ using MaxType = typename MaxType_<T, U, sizeof(T) >= sizeof(U)>::Type;
// Resolves to the larger of the two input types. // Resolves to the larger of the two input types.
template <typename T, typename U> template <typename T, typename U>
inline KJ_CONSTEXPR() auto max(T&& a, U&& b) -> MaxType<Decay<T>, Decay<U>> { inline constexpr auto max(T&& a, U&& b) -> MaxType<Decay<T>, Decay<U>> {
return a > b ? MaxType<Decay<T>, Decay<U>>(a) : MaxType<Decay<T>, Decay<U>>(b); return a > b ? MaxType<Decay<T>, Decay<U>>(a) : MaxType<Decay<T>, Decay<U>>(b);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment