Changeset 6283bf15 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:

94ac2ea

Parents:

bdc981b

git-author:

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

git-committer:

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

Message:

cpp: added conditional typedefs for function-like objects

Location:

uspace/lib/cpp/include

Files:

• impl/functional.hpp (modified) (2 diffs)
• internal/functional/conditional_function_typedefs.hpp (added)
• internal/functional/function.hpp (modified) (2 diffs)
• internal/functional/reference_wrapper.hpp (modified) (2 diffs)

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

@@ -30 +30 @@
 #define LIBCPP_FUNCTIONAL
 
+#include <internal/functional/conditional_function_typedefs.hpp>
 #include <internal/functional/invoke.hpp>
 #include <limits>
@@ -639 +640 @@
         template<class F>
         class mem_fn_t
-        {
-            // TODO: conditional typedefs
+            : public conditional_function_typedefs<remove_cv_t<remove_reference_t<T>>>
+        {
             public:
                 mem_fn_t(F f)

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

@@ -30 +30 @@
 #define LIBCPP_INTERNAL_FUNCTIONAL_FUNCTION
 
+#include <internal/functional/conditional_function_typedefs.hpp>
 #include <internal/functional/reference_wrapper.hpp>
 #include <typeinfo>
@@ -94 +95 @@
     template<class R, class... Args>
     class function<R(Args...)>
+        : public aux::conditional_function_typedefs<Args...>
     {
         public:
             using result_type = R;
-            // TODO: conditional typedefs
 
             /**

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

@@ -30 +30 @@
 #define LIBCPP_INTERNAL_FUNCTIONAL_REFERENCE_WRAPPER
 
+#include <internal/functional/conditional_function_typedefs.hpp>
 #include <internal/functional/invoke.hpp>
 #include <type_traits>
@@ -41 +42 @@
     template<class T>
     class reference_wrapper
+        : public aux::conditional_function_typedefs<remove_cv_t<remove_reference_t<T>>>
     {
         public:
             using type = T;
-            // TODO: conditional typedefs
 
             reference_wrapper(type& val) noexcept