Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41: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
hal/src/main/native/sim/Interrupts.cpp
View File

@@ -215,14 +215,8 @@ static int64_t WaitForInterruptDigital(HAL_InterruptHandle handle,
wpi::mutex waitMutex;
#if defined(_MSC_VER) && _MSC_VER < 1900
auto timeoutTime = std::chrono::steady_clock::now() +
std::chrono::duration<int64_t, std::nano>(
static_cast<int64_t>(timeout * 1e9));
#else
auto timeoutTime =
std::chrono::steady_clock::now() + std::chrono::duration<double>(timeout);
#endif
{
std::unique_lock<wpi::mutex> lock(waitMutex);
@@ -285,14 +279,8 @@ static int64_t WaitForInterruptAnalog(HAL_InterruptHandle handle,
wpi::mutex waitMutex;
#if defined(_MSC_VER) && _MSC_VER < 1900
auto timeoutTime = std::chrono::steady_clock::now() +
std::chrono::duration<int64_t, std::nano>(
static_cast<int64_t>(timeout * 1e9));
#else
auto timeoutTime =
std::chrono::steady_clock::now() + std::chrono::duration<double>(timeout);
#endif
{
std::unique_lock<wpi::mutex> lock(waitMutex);