Changeset 4dfb259 in mainline

Timestamp:

2019-07-03T10:00:07Z (5 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

b96e87e

Parents:

5ab9df4

Message:

cpp: fix copy paste errors

Location:

uspace/lib/cpp/include/__bits/thread

Files:

• packaged_task.hpp (modified) (1 diff)
• promise.hpp (modified) (3 diffs)

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

@@ -177 +177 @@
             }
 
-            void make_ready_at_thread_exit(Args...)
+            void make_ready_at_thread_exit(Args... args)
             {
                 if (!state_)

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

@@ -227 +227 @@
                 try
                 {
-                    state_->set_value(invoke(func_, args...), false);
+                    this->state_->set_value(val, false);
                     aux::set_state_value_at_thread_exit(this->state_);
                 }
                 catch(const exception& __exception)
                 {
-                    state_->set_exception(make_exception_ptr(__exception), false);
+                    this->state_->set_exception(make_exception_ptr(__exception), false);
                     aux::set_state_exception_at_thread_exit(this->state_);
                 }
@@ -250 +250 @@
                 try
                 {
-                    state_->set_value(invoke(func_, args...), false);
+                    this->state_->set_value(forward(val), false);
                     aux::set_state_value_at_thread_exit(this->state_);
                 }
                 catch(const exception& __exception)
                 {
-                    state_->set_exception(make_exception_ptr(__exception), false);
+                    this->state_->set_exception(make_exception_ptr(__exception), false);
                     aux::set_state_exception_at_thread_exit(this->state_);
                 }
@@ -329 +329 @@
                 try
                 {
-                    state_->set_value(invoke(func_, args...), false);
+                    this->state_->set_value(&val, false);
                     aux::set_state_value_at_thread_exit(this->state_);
                 }
                 catch(const exception& __exception)
                 {
-                    state_->set_exception(make_exception_ptr(__exception), false);
+                    this->state_->set_exception(make_exception_ptr(__exception), false);
                     aux::set_state_exception_at_thread_exit(this->state_);
                 }