Use simpler tags for ctor dispatch in exception_wrapper

[folly.git] / folly / ConstexprMath.h

diff --git a/folly/ConstexprMath.h b/folly/ConstexprMath.h
index 1650c02c9119d8f75ba12b6899f0bf17e13c52c1..7e14195c5009eabda1b0c9dc8fe2c878c5f5b79d 100644 (file)
--- a/folly/ConstexprMath.h
+++ b/folly/ConstexprMath.h
@@ -41,7 +41,23 @@ constexpr T constexpr_min(T a) {
 }
 template <typename T, typename... Ts>
 constexpr T constexpr_min(T a, T b, Ts... ts) {
-  return b < a ? constexpr_max(b, ts...) : constexpr_max(a, ts...);
+  return b < a ? constexpr_min(b, ts...) : constexpr_min(a, ts...);
+}
+
+template <typename T, typename Less>
+constexpr T const&
+constexpr_clamp(T const& v, T const& lo, T const& hi, Less less) {
+  return less(v, lo) ? lo : less(hi, v) ? hi : v;
+}
+
+template <typename T>
+constexpr T const& constexpr_clamp(T const& v, T const& lo, T const& hi) {
+  struct Less {
+    constexpr bool operator()(T const& a, T const& b) const {
+      return a < b;
+    }
+  };
+  return constexpr_clamp(v, lo, hi, Less{});
 }
 
 namespace detail {