Make findIf functionn acting on values uniformly callable.

HaxyM · Sep 3, 2024 · e76493e · e76493e
1 parent 920a7cb
commit e76493e
Showing 1 changed file with 37 additions and 0 deletions.
diff --git a/include/crap/algorithm.d/findifvalue.h b/include/crap/algorithm.d/findifvalue.h
@@ -4,6 +4,7 @@
 #include <cstddef>
 
 #include "../utility.d/bisectvalue.h"
+#include "../version.d/libintegralconstantcallable.h"
 
 namespace crap
 {
@@ -15,6 +16,9 @@ namespace crap
   constexpr const static std :: size_t npos = 0u;
   using value_type = decltype(value);
   constexpr operator value_type () const noexcept;
+#if (crap_lib_integral_constant_callable >= 201304L)
+  constexpr value_type operator () () const noexcept;
+#endif
  };
 
  template <class Type, template <Type> class Operator, Type Value> struct findIfValue<Type, Operator, Value>
@@ -23,6 +27,9 @@ namespace crap
   constexpr const static std :: size_t npos = 1u;
   using value_type = decltype(value);
   constexpr operator value_type () const noexcept;
+#if (crap_lib_integral_constant_callable >= 201304L)
+  constexpr value_type operator () () const noexcept;
+#endif
  };
 
  template <class Type, template <Type> class Operator, Type ... Values> struct findIfValue
@@ -38,6 +45,9 @@ namespace crap
   constexpr const static std :: size_t npos = sizeof...(Values);
   using value_type = decltype(value);
   constexpr operator value_type () const noexcept;
+#if (crap_lib_integral_constant_callable >= 201304L)
+  constexpr value_type operator () () const noexcept;
+#endif
  };
 
  template <class Type, template <Type> class Operator, Type ... Values>
@@ -65,19 +75,46 @@ typename crap :: findIfValue <Type, Operator> :: value_type () const noexcept
 {
  return crap :: findIfValue <Type, Operator> :: value;
 }
+#if (crap_lib_integral_constant_callable >= 201304L)
+
+template <class Type, template <Type> class Operator>
+        inline constexpr typename crap :: findIfValue <Type, Operator> :: value_type
+        crap :: findIfValue <Type, Operator> :: operator () () const noexcept
+{
+ return crap :: findIfValue <Type, Operator> :: value;
+}
+#endif
 
 template <class Type, template <Type> class Operator, Type Value>
 inline constexpr crap :: findIfValue <Type, Operator, Value> :: operator
 typename crap :: findIfValue <Type, Operator, Value> :: value_type () const noexcept
 {
  return crap :: findIfValue <Type, Operator, Value> :: value;
 }
+#if (crap_lib_integral_constant_callable >= 201304L)
+
+template <class Type, template <Type> class Operator, Type Value>
+        inline constexpr typename crap :: findIfValue <Type, Operator, Value> :: value_type
+        crap :: findIfValue <Type, Operator, Value> :: operator () () const noexcept
+{
+ return crap :: findIfValue <Type, Operator, Value> :: value;
+}
+#endif
 
 template <class Type, template <Type> class Operator, Type ... Values>
 inline constexpr crap :: findIfValue <Type, Operator, Values...> :: operator
 typename crap :: findIfValue <Type, Operator, Values...> :: value_type () const noexcept
 {
  return crap :: findIfValue <Type, Operator, Values...> :: value;
 }
+#if (crap_lib_integral_constant_callable >= 201304L)
+
+template <class Type, template <Type> class Operator, Type ... Values>
+        inline constexpr typename crap :: findIfValue <Type, Operator, Values...> :: value_type
+        crap :: findIfValue <Type, Operator, Values...> :: operator () () const noexcept
+{
+ return crap :: findIfValue <Type, Operator, Values...> :: value;
+}
+#endif
 #endif