diff --git a/src/common/bspf.hxx b/src/common/bspf.hxx
index f3a155a7a..6bb34d308 100644
--- a/src/common/bspf.hxx
+++ b/src/common/bspf.hxx
@@ -167,7 +167,7 @@ namespace BSPF
   // if it is outside the specified range
   template<typename T> inline constexpr T clamp(T val, T lower, T upper)
   {
-    return (val < lower) ? lower : (val > upper) ? upper : val;
+    return std::clamp<T>(val, lower, upper);
   }
   template<typename T> inline constexpr void clamp(T& val, T lower, T upper, T setVal)
   {