Changeset 8f8f1d1e in mainline

Timestamp:

2018-07-05T21:41:23Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f6f636f

Parents:

0e5e8bf9

git-author:

Dzejrou <dzejrou@…> (2018-05-12 17:12:15)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:23)

Message:

cpp: removed usage of _v aliases and added forward declarations instead, this avoids possible circular reference

Location:

uspace/lib/cpp/include/internal/functional

Files:

• hash.hpp (modified) (2 diffs)
• invoke.hpp (modified) (5 diffs)

uspace/lib/cpp/include/internal/functional/hash.hpp

@@ -30 +30 @@
 #define LIBCPP_INTERNAL_FUNCTIONAL_HASH
 
+#include <cstdlib>
+
 namespace std
 {
+    template<class>
+    struct is_arithmetic;
+
+    template<class>
+    struct is_pointer;
+
     /**
      * 20.9.13, hash function primary template:
@@ -64 +72 @@
         size_t hash(T x) noexcept
         {
-            static_assert(is_arithmetic_v<T> || is_pointer_v<T>,
+            static_assert(is_arithmetic<T>::value || is_pointer<T>::value,
                           "invalid type passed to aux::hash");
 

uspace/lib/cpp/include/internal/functional/invoke.hpp

@@ -32 +32 @@
 #include <internal/utility/declval.hpp>
 #include <internal/utility/forward_move.hpp>
-#include <type_traits>
+
+namespace std
+{
+    template<class>
+    struct is_member_function_pointer;
+
+    template<class, class>
+    struct is_base_of;
+
+    template<class>
+    struct is_member_object_pointer;
+}
 
 namespace std::aux
@@ -43 +54 @@
     decltype(auto) invoke(R T::* f, T1&& t1, Ts&&... args)
     {
-        if constexpr (is_member_function_pointer_v<decltype(f)>)
+        if constexpr (is_member_function_pointer<decltype(f)>::value)
         {
-            if constexpr (is_base_of_v<T, remove_reference_t<T1>>)
+            if constexpr (is_base_of<T, remove_reference_t<T1>>::value)
                 // (1.1)
                 return (t1.*f)(forward<Ts>(args)...);
@@ -52 +63 @@
                 return ((*t1).*f)(forward<Ts>(args)...);
         }
-        else if constexpr (is_member_object_pointer_v<decltype(f)> && sizeof...(args) == 0)
+        else if constexpr (is_member_object_pointer<decltype(f)>::value && sizeof...(args) == 0)
         {
             /**
@@ -58 +69 @@
              *       so we need sizeof...(args) to be 0.
              */
-            if constexpr (is_base_of_v<T, remove_reference_t<T1>>)
+            if constexpr (is_base_of<T, remove_reference_t<T1>>::value)
                 // (1.3)
                 return t1.*f;
@@ -73 +84 @@
          *       so we use this because we know it is false here.
          */
-        static_assert(is_member_function_pointer_v<decltype(f)>, "invalid invoke");
+        static_assert(is_member_function_pointer<decltype(f)>::value, "invalid invoke");
     }