Changeset f25d4a4 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

e54bbde5

Parents:

4529c4b

git-author:

Dzejrou <dzejrou@…> (2018-05-11 18:04:30)

git-committer:

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

Message:

cpp: fixed result_of

File:

• uspace/lib/cpp/include/internal/type_traits/result_of.hpp (modified) (1 diff)

uspace/lib/cpp/include/internal/type_traits/result_of.hpp

@@ -35 +35 @@
 {
     template<class>
-    class result_of
+    struct is_function;
+
+    template<class>
+    struct is_class;
+
+    template<class>
+    struct is_member_pointer;
+
+    template<bool, class>
+    struct enable_if;
+
+    template<class>
+    struct decay;
+
+    template<class>
+    struct remove_pointer;
+
+    template<class>
+    struct result_of
     { /* DUMMY BODY */ };
 
     template<class F, class... ArgTypes>
-    class result_of<F(ArgTypes...)>: aux::type_is<
-        decltype(aux::invoke(declval<F>(), declval<ArgTypes>()...))
+    struct result_of<F(ArgTypes...)>: aux::type_is<
+        typename enable_if<
+            is_function<typename decay<typename remove_pointer<F>::type>::type>::value ||
+            is_class<typename decay<F>::type>::value ||
+            is_member_pointer<typename decay<F>::type>::value,
+            decltype(aux::invoke(declval<F>(), declval<ArgTypes>()...))
+        >::type
     >
     { /* DUMMY BODY */ };