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

Removes MSVC 2013 Shims (#1130)

Browse Source 
We have done things recently that have broken any builds before VS 2015
This commit is contained in:
Thad House
2018-06-03 17:16:51 -07:00
committed by Peter Johnson
parent e548a5f705
commit 86285b427f
4 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ntcore/src/main/native/cpp/CallbackManager.h
View File

@@ -207,14 +207,8 @@ class CallbackManager {
if (!thr) return true;
auto& lock = thr.GetLock();
#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>(timeout * 1e9));
#else
auto timeout_time = std::chrono::steady_clock::now() +
std::chrono::duration<double>(timeout);
#endif
while (!thr->m_queue.empty()) {
if (!thr->m_active) return true;
if (timeout == 0) return false;
@@ -247,14 +241,8 @@ class CallbackManager {
}
std::unique_lock<wpi::mutex> lock(poller->poll_mutex);
#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>(timeout * 1e9));
#else
auto timeout_time = std::chrono::steady_clock::now() +
std::chrono::duration<double>(timeout);
#endif
*timed_out = false;
while (poller->poll_queue.empty()) {
if (poller->terminating) return infos;

6
ntcore/src/main/native/cpp/Storage.cpp
View File

@@ -1085,14 +1085,8 @@ bool Storage::GetRpcResult(unsigned int local_id, unsigned int call_uid,
// only allow one blocking call per rpc call uid
if (!m_rpc_blocking_calls.insert(call_pair).second) return false;
#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>(timeout * 1e9));
#else
auto timeout_time =
std::chrono::steady_clock::now() + std::chrono::duration<double>(timeout);
#endif
*timed_out = false;
for (;;) {
auto i = m_rpc_results.find(call_pair);