Changeset 1621f91 in mainline

Timestamp:

2019-07-01T15:51:01Z (5 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

fda6dd4

Parents:

8660ad0

Message:

cpp: fix return types for future<R>::get and shared_future<R>::get

Location:

uspace/lib/cpp/include/__bits/thread

Files:

• future_common.hpp (modified) (2 diffs)
• shared_future.hpp (modified) (1 diff)

uspace/lib/cpp/include/__bits/thread/future_common.hpp

@@ -105 +105 @@
 
         template<class T>
-        struct future_return: aux::type_is<const T&>
+        struct future_return: aux::type_is<T>
         { /* DUMMY BODY */ };
 
@@ -112 +112 @@
         { /* DUMMY BODY */ };
 
-        template<>
-        struct future_return<void>: aux::type_is<void>
+        template<class T>
+        using future_return_t = typename future_return<T>::type;
+
+        template<class T>
+        struct future_return_shared: aux::type_is<const T&>
         { /* DUMMY BODY */ };
 
         template<class T>
-        using future_return_t = typename future_return<T>::type;
+        struct future_return_shared<T&>: aux::type_is<T&>
+        { /* DUMMY BODY */ };
+
+        template<>
+        struct future_return_shared<void>: aux::type_is<void>
+        { /* DUMMY BODY */ };
+
+        template<class T>
+        using future_return_shared_t = typename future_return_shared<T>::type;
     }
 }

uspace/lib/cpp/include/__bits/thread/shared_future.hpp

@@ -70 +70 @@
             shared_future& operator=(shared_future&&) noexcept = default;
 
-            aux::future_return_t<R> get() const
+            aux::future_return_shared_t<R> get() const
             {
                 assert(this->state_);