Changeset 47:c8fa9edd23e7 in finroc_plugins_rpc_ports


Ignore:
Timestamp:
04.05.2020 23:55:39 (12 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • tFuture.h

    r42 r47  
    175175    storage.reset(); 
    176176    result_buffer = NULL; 
    177     return std::move(result); 
     177    return result; 
    178178  } 
    179179 
  • tFuture.h

    r46 r47  
    153153        } 
    154154        storage->waiting = true; 
    155         std::cv_status cv_status = storage->condition_variable.wait_for(lock.GetSimpleLock(), timeout); 
     155        auto cv_status = storage->condition_variable.Wait(lock, timeout, false); 
    156156        storage->waiting = false; 
    157         if (cv_status == std::cv_status::timeout) 
     157        if (cv_status == rrlib::thread::tConditionVariableStatus::TIMEOUT) 
    158158        { 
    159159          throw tRPCException(tFutureStatus::TIMEOUT); 
Note: See TracChangeset for help on using the changeset viewer.