From d720ef55a49ef6509a7bfbee18023f1674116c19 Mon Sep 17 00:00:00 2001
From: Igor Zarzycki <izarzycki@mailfence.com>
Date: Tue, 20 Aug 2024 15:46:33 +0200
Subject: [PATCH] Make noneOf function acting on types uniformly callable.

---
 include/crap/algorithm.d/noneoftype.h | 29 ++++++++++++++++-----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/include/crap/algorithm.d/noneoftype.h b/include/crap/algorithm.d/noneoftype.h
index da53c2e..46450d0 100644
--- a/include/crap/algorithm.d/noneoftype.h
+++ b/include/crap/algorithm.d/noneoftype.h
@@ -1,44 +1,49 @@
 #ifndef CRAP_ALGORITHM_NONEOFTYPE
 #define CRAP_ALGORITHM_NONEOFTYPE
 
+#include <type_traits>
+
 #include "../functional.d/logicalnotvalue.h"
 #include "../functional.d/logicalorvalue.h"
 #include "../utility.d/commontype.h"
+#include "../version.d/libintegralconstantcallable.h"
 
 namespace crap
 {
  template <template <class> class, class...> struct noneOfType;
 
  template <template <class> class Operator> struct noneOfType<Operator>
- {
-  constexpr const static bool value = true;
-  using value_type = decltype(value);
-  constexpr operator value_type () const noexcept;
- };
+	 : std :: integral_constant<bool, true> {};
 
  template <template <class> class Operator, class ... Types> struct noneOfType
  {
   private:
   using resultType = typename commonType <decltype(Operator <Types> :: value)...> :: type;
-  constexpr const static auto orValue = logicalOrValue <resultType, static_cast<resultType>(Operator <Types> :: value)...> :: value;
+  constexpr const static auto orValue =
+	  logicalOrValue <resultType, static_cast<resultType>(Operator <Types> :: value)...> :: value;
   public:
   constexpr const static auto value = logicalNotValue <decltype(orValue), orValue> :: value;
   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 <template <class> class Operator>
-        inline constexpr crap :: noneOfType <Operator> :: operator
-	typename crap :: noneOfType <Operator> :: value_type () const noexcept
+template <template <class> class Operator, class ... Types>
+        inline constexpr crap :: noneOfType <Operator, Types...> :: operator
+	typename crap :: noneOfType <Operator, Types...> :: value_type () const noexcept
 {
- return crap :: noneOfType <Operator> :: value;
+ return crap :: noneOfType <Operator, Types...> :: value;
 }
+#if (crap_lib_integral_constant_callable >= 201304L)
 
 template <template <class> class Operator, class ... Types>
-        inline constexpr crap :: noneOfType <Operator, Types...> :: operator
-	typename crap :: noneOfType <Operator, Types...> :: value_type () const noexcept
+	inline constexpr typename crap :: noneOfType <Operator, Types...> :: value_type
+	crap :: noneOfType <Operator, Types...> :: operator () () const noexcept
 {
  return crap :: noneOfType <Operator, Types...> :: value;
 }
 #endif
+#endif