Changeset 47:c8fa9edd23e7 in finroc_plugins_rpc_ports

Timestamp:

04.05.2020 23:55:39 (3 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Children:

48:0b9dd10b2cbf, 49:ad6afe9e37d7

Parents:

44:ba07ebacf4ec (diff), 46:41a1dbbb3b74 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge with 14.08

Files:

• tFuture.h (modified) (1 diff)
• tFuture.h (modified) (1 diff)

tFuture.h

@@ -175 +175 @@
     storage.reset();
     result_buffer = NULL;
-    return std::move(result);
+    return result;
   }
 

tFuture.h

@@ -153 +153 @@
         }
         storage->waiting = true;
-        std::cv_status cv_status = storage->condition_variable.wait_for(lock.GetSimpleLock(), timeout);
+        auto cv_status = storage->condition_variable.Wait(lock, timeout, false);
         storage->waiting = false;
-        if (cv_status == std::cv_status::timeout)
+        if (cv_status == rrlib::thread::tConditionVariableStatus::TIMEOUT)
         {
           throw tRPCException(tFutureStatus::TIMEOUT);