Changeset 9c9ee5d in mainline for uspace/lib/cpp/include/internal/tuple/tuple_ops.hpp

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:

6175b78

Parents:

f6f636f

git-author:

Dzejrou <dzejrou@…> (2018-05-12 21:01:13)

git-committer:

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

Message:

cpp: fixed bugs found by the tuple tests

File:

• uspace/lib/cpp/include/internal/tuple/tuple_ops.hpp (modified) (2 diffs)

uspace/lib/cpp/include/internal/tuple/tuple_ops.hpp

@@ -50 +50 @@
     {
         template<class T, class U>
-        static void assign(T&& lhs, U&& rhs)
+        static void assign_copy(T& lhs, const U& rhs)
         {
-            get<I>(forward<T>(lhs)) = get<I>(forward<U>(rhs));
+            get<I>(lhs) = get<I>(rhs);
 
-            tuple_ops<I + 1, N>::assign(forward<T>(lhs), forward<U>(rhs));
+            tuple_ops<I + 1, N>::assign_copy(lhs, rhs);
+        }
+
+        template<class T, class U>
+        static void assign_move(T& lhs, U&& rhs)
+        {
+            get<I>(lhs) = move(get<I>(rhs));
+
+            tuple_ops<I + 1, N>::assign_move(lhs, move(rhs));
         }
 
@@ -83 +91 @@
     {
         template<class T, class U>
-        static void assign(T&& lhs, U&& rhs)
+        static void assign_copy(T& lhs, const U& rhs)
         {
-            get<N>(forward<T>(lhs)) = get<N>(forward<U>(rhs));
+            get<N>(lhs) = get<N>(rhs);
+        }
+
+        template<class T, class U>
+        static void assign_move(T& lhs, U&& rhs)
+        {
+            get<N>(lhs) = move(get<N>(rhs));
         }