Changeset ca32d45 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

0a414494

Parents:

55540fca

git-author:

Dzejrou <dzejrou@…> (2018-05-03 21:44:59)

git-committer:

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

Message:

cpp: added missing uses_allocator metafunction and deleted redundant (and wrong) forward declaration of uses_allocator in the tuple header

Location:

uspace/lib/cpp/include/impl

Files:

• memory.hpp (modified) (1 diff)
• tuple.hpp (modified) (1 diff)

uspace/lib/cpp/include/impl/memory.hpp

@@ -62 +62 @@
 
     /**
+     * 20.7.7, uses_allocator:
+     */
+
+    namespace aux
+    {
+        template<class T, class = void>
+        struct has_allocator_type: false_type
+        { /* DUMMY BODY */ };
+
+        template<class T>
+        struct has_allocator_type<T, void_t<typename T::allocator_type>>
+            : true_type
+        { /* DUMMY BODY */ };
+    }
+
+    template<class T, class Alloc, class = void>
+    struct uses_allocator
+        : aux::value_is<
+        bool, aux::has_allocator_type<T>::value && is_convertible_v<
+            Alloc, typename T::allocator_type
+        >
+    >
+    { /* DUMMY BODY */ };
+
+    /**
      * 20.7.8, allocator traits:
      */

uspace/lib/cpp/include/impl/tuple.hpp

@@ -463 +463 @@
      */
 
-    template<class...>
-    struct uses_allocator;
-
     template<class... Ts, class Alloc>
     struct uses_allocator<tuple<Ts...>, Alloc>: true_type