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

Moves the HAL priority_ custom types to the hal namespace (#532)

Browse Source 
There is a shim for backwards compatibility, just like the frc namespace.
As with the frc namespace, the library compiles without the shim.
This commit is contained in:
Thad House
2017-05-11 21:25:22 -07:00
committed by Peter Johnson
parent 16e71eac43
commit efec0c5cc3
47 changed files with 250 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/sim/include/MotorSafetyHelper.h
View File

@@ -37,12 +37,12 @@ class MotorSafetyHelper : public ErrorBase {
// the FPGA clock value when this motor has expired
double m_stopTime;
// protect accesses to the state for this object
mutable priority_recursive_mutex m_syncMutex;
mutable hal::priority_recursive_mutex m_syncMutex;
MotorSafety* m_safeObject; // the object that is using the helper
// List of all existing MotorSafetyHelper objects.
static std::set<MotorSafetyHelper*> m_helperList;
// protect accesses to the list of helpers
static priority_recursive_mutex m_listMutex;
static hal::priority_recursive_mutex m_listMutex;
};
} // namespace frc

6
wpilibc/sim/include/Notifier.h
View File

@@ -39,8 +39,8 @@ class Notifier : public ErrorBase {
private:
static std::list<Notifier*> timerQueue;
static priority_recursive_mutex queueMutex;
static priority_mutex halMutex;
static hal::priority_recursive_mutex queueMutex;
static hal::priority_mutex halMutex;
static void* m_notifier;
static std::atomic<int> refcount;
@@ -67,7 +67,7 @@ class Notifier : public ErrorBase {
// Indicates if this entry is queued
bool m_queued = false;
// Held by interrupt manager task while handler call is in progress
priority_mutex m_handlerMutex;
hal::priority_mutex m_handlerMutex;
static std::thread m_task;
static std::atomic<bool> m_stopped;
static void Run();