Don't expose is_maybe

Dobiasd · Dec 26, 2023 · f22231c · f22231c
1 parent e78b910
commit f22231c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/include/fplus/maybe.hpp b/include/fplus/maybe.hpp
@@ -23,6 +23,8 @@ namespace fplus
 template <typename T>
 class maybe;
 
+namespace internal
+{
 template <typename>
 struct is_maybe : std::false_type
 {
@@ -32,6 +34,7 @@ template <typename T>
 struct is_maybe<maybe<T>> : std::true_type
 {
 };
+}
 
 template <typename T>
 class maybe
@@ -199,7 +202,7 @@ class maybe
     auto join() const
     {
         static_assert(
-            is_maybe<T>::value,
+            internal::is_maybe<T>::value,
             "Cannot join when value type is not also a maybe"
             );
         if (is_just())
@@ -218,7 +221,7 @@ class maybe
     {
         internal::trigger_static_asserts<internal::check_arity_tag, F, T>();
         using FOut = std::decay_t<internal::invoke_result_t<F, T>>;
-        static_assert(is_maybe<FOut>::value,
+        static_assert(internal::is_maybe<FOut>::value,
                       "Function must return a maybe<> type");
         if (is_just())
             return internal::invoke(f, unsafe_get_just());
@@ -461,11 +464,11 @@ auto compose_maybe(Callables&&... callables)
         {
             using FOut = std::decay_t<
                 internal::invoke_result_t<decltype(f), decltype(args)...>>;
-            static_assert(is_maybe<FOut>::value,
+            static_assert(internal::is_maybe<FOut>::value,
                           "Functions must return a maybe<> type");
             using GOut = std::decay_t<
                 internal::invoke_result_t<decltype(g), typename FOut::type>>;
-            static_assert(is_maybe<GOut>::value,
+            static_assert(internal::is_maybe<GOut>::value,
                           "Functions must return a maybe<> type");
 
             auto maybeB =

diff --git a/include_all_in_one/include/fplus/fplus.hpp b/include_all_in_one/include/fplus/fplus.hpp
@@ -2502,6 +2502,8 @@ namespace fplus
 template <typename T>
 class maybe;
 
+namespace internal
+{
 template <typename>
 struct is_maybe : std::false_type
 {
@@ -2511,6 +2513,7 @@ template <typename T>
 struct is_maybe<maybe<T>> : std::true_type
 {
 };
+}
 
 template <typename T>
 class maybe
@@ -2678,7 +2681,7 @@ class maybe
     auto join() const
     {
         static_assert(
-            is_maybe<T>::value,
+            internal::is_maybe<T>::value,
             "Cannot join when value type is not also a maybe"
             );
         if (is_just())
@@ -2697,7 +2700,7 @@ class maybe
     {
         internal::trigger_static_asserts<internal::check_arity_tag, F, T>();
         using FOut = std::decay_t<internal::invoke_result_t<F, T>>;
-        static_assert(is_maybe<FOut>::value,
+        static_assert(internal::is_maybe<FOut>::value,
                       "Function must return a maybe<> type");
         if (is_just())
             return internal::invoke(f, unsafe_get_just());
@@ -2940,11 +2943,11 @@ auto compose_maybe(Callables&&... callables)
         {
             using FOut = std::decay_t<
                 internal::invoke_result_t<decltype(f), decltype(args)...>>;
-            static_assert(is_maybe<FOut>::value,
+            static_assert(internal::is_maybe<FOut>::value,
                           "Functions must return a maybe<> type");
             using GOut = std::decay_t<
                 internal::invoke_result_t<decltype(g), typename FOut::type>>;
-            static_assert(is_maybe<GOut>::value,
+            static_assert(internal::is_maybe<GOut>::value,
                           "Functions must return a maybe<> type");
 
             auto maybeB =