Changeset 55540fca in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

ca32d45

Parents:

9c00022

git-author:

Dzejrou <dzejrou@…> (2018-05-03 20:36:14)

git-committer:

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

Message:

cpp: added uses_allocator for function

File:

• uspace/lib/cpp/include/impl/functional.hpp (modified) (2 diffs)

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

@@ -1045 +1045 @@
 
     /**
+     * 20.9.12.2.6, null pointer comparisons:
+     */
+
+    template<class R, class... Args>
+    bool operator==(const function<R(Args...)>& f, nullptr_t) noexcept
+    {
+        return !f;
+    }
+
+    template<class R, class... Args>
+    bool operator==(nullptr_t, const function<R(Args...)>& f) noexcept
+    {
+        return !f;
+    }
+
+    template<class R, class... Args>
+    bool operator!=(const function<R(Args...)>& f, nullptr_t) noexcept
+    {
+        return (bool)f;
+    }
+
+    template<class R, class... Args>
+    bool operator!=(nullptr_t, const function<R(Args...)>& f) noexcept
+    {
+        return (bool)f;
+    }
+
+    /**
      * 20.9.12.2.7, specialized algorithms:
      */
@@ -1054 +1082 @@
     }
 
-    /**
-     * 20.9.12.2.6, null pointer comparisons:
-     */
-
-    template<class R, class... Args>
-    bool operator==(const function<R(Args...)>& f, nullptr_t) noexcept
-    {
-        return !f;
-    }
-
-    template<class R, class... Args>
-    bool operator==(nullptr_t, const function<R(Args...)>& f) noexcept
-    {
-        return !f;
-    }
-
-    template<class R, class... Args>
-    bool operator!=(const function<R(Args...)>& f, nullptr_t) noexcept
-    {
-        return (bool)f;
-    }
-
-    template<class R, class... Args>
-    bool operator!=(nullptr_t, const function<R(Args...)>& f) noexcept
-    {
-        return (bool)f;
-    }
+    template<class R, class... Args, class Alloc>
+    struct uses_allocator<function<R(Args...)>, Alloc>
+        : true_type
+    { /* DUMMY BODY */ };
 
     /**