Changeset 7a666789 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

875788a8

Parents:

ac68088

git-author:

Dzejrou <dzejrou@…> (2018-04-24 16:31:10)

git-committer:

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

Message:

cpp: added missing make_pair (and added todos for missed sections), moved type transformation to an auxiliary header

Location:

uspace/lib/cpp/include

Files:

• impl/tuple.hpp (modified) (2 diffs)
• impl/utility.hpp (modified) (2 diffs)
• internal/type_transformation.hpp (added)

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

@@ -33 +33 @@
 #include <internal/tuple_cat.hpp>
 #include <internal/tuple_ops.hpp>
+#include <internal/type_transformation.hpp>
 #include <functional>
 #include <type_traits>
@@ -59 +60 @@
 
     inline constexpr aux::ignore_t ignore;
-
-    namespace aux
-    {
-        template<class T>
-        struct remove_reference_wrapper: type_is<T>
-        { /* DUMMY BODY */ };
-
-        template<class T>
-        struct remove_reference_wrapper<reference_wrapper<T>>: type_is<T&>
-        { /* DUMMY BODY */ };
-
-        template<class T>
-        using remove_reference_wrapper_t = typename remove_reference_wrapper<T>::type;
-
-        template<class T>
-        using transform_tuple_types_t = remove_reference_wrapper_t<decay_t<T>>;
-    }
 
     template<class... Ts> // TODO: test the reference_wrapper version once we got reference_wrapper

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

@@ -31 +31 @@
 
 #include <cstdint>
+#include <internal/type_transformation.hpp>
 #include <type_traits>
 
@@ -208 +209 @@
         }
     };
+
+    /**
+     * 20.3.3, specialized algorithms:
+     */
+
+    // TODO: implement
+
+    template<class T1, class T2>
+    constexpr auto make_pair(T1&& t1, T2&& t2)
+    {
+        return pair<
+            aux::transform_tuple_types_t<T1>,
+            aux::transform_tuple_types_t<T2>
+        >{
+            forward<T1>(t1), forward<T2>(t2)
+        };
+    }
+
+    /**
+     * 20.3.4, tuple-like access to pair:
+     */
+
+    // TODO: implement
 
     /**