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

Ran format.py after writing unit tests for and fixing bugs in it (#239)

Browse Source
This commit is contained in:
Tyler Veness
2016-09-21 23:48:54 -07:00
committed by Peter Johnson
parent ac9b6f7b18
commit 659dbef751
20 changed files with 96 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/include/HAL/cpp/priority_condition_variable.h
View File

@@ -23,7 +23,7 @@
#include "priority_mutex.h"
class priority_condition_variable {
typedef std::chrono::system_clock clock_t;
typedef std::chrono::system_clock clock;
public:
typedef std::condition_variable::native_handle_type native_handle_type;
@@ -93,13 +93,13 @@ class priority_condition_variable {
template <typename Lock, typename Rep, typename Period>
std::cv_status wait_for(Lock& lock,
const std::chrono::duration<Rep, Period>& rtime) {
return wait_until(lock, clock_t::now() + rtime);
return wait_until(lock, clock::now() + rtime);
}
template <typename Lock, typename Rep, typename Period, typename Predicate>
bool wait_for(Lock& lock, const std::chrono::duration<Rep, Period>& rtime,
Predicate p) {
return wait_until(lock, clock_t::now() + rtime, std::move(p));
return wait_until(lock, clock::now() + rtime, std::move(p));
}
native_handle_type native_handle() { return m_cond.native_handle(); }