Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the final issue with VS 2013 builds (#109)

Browse Source
This commit is contained in:
Thad House
2016-08-30 21:27:48 -07:00
committed by Peter Johnson
parent ade4e87d6f
commit 85156d15ca
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Storage.cpp
View File

@@ -1428,8 +1428,14 @@ bool Storage::GetRpcResult(bool blocking, unsigned int call_uid, double time_out
if (time_out < 0) {
m_rpc_results_cond.wait(lock);
} else {
#if defined(_MSC_VER) && _MSC_VER < 1900
auto timeout_time = std::chrono::steady_clock::now() +
std::chrono::duration<int64_t, std::nano>(static_cast<int64_t>
(time_out * 1e9));
#else
auto timeout_time = std::chrono::steady_clock::now() +
std::chrono::duration<double>(time_out);
#endif
auto timed_out = m_rpc_results_cond.wait_until(lock, timeout_time);
if (timed_out == std::cv_status::timeout) {
m_rpc_blocking_calls.erase(call_uid);