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

Cleaned up variable names for std::lock_guard and their associated mutexes (#759)

Browse Source
This commit is contained in:
Tyler Veness
2017-11-22 17:10:21 -08:00
committed by Peter Johnson
parent 96de0b5b11
commit ba879f4663
22 changed files with 136 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/src/main/native/include/Commands/Scheduler.h
View File

@@ -54,11 +54,11 @@ class Scheduler : public ErrorBase, public NamedSendable {
void ProcessCommandAddition(Command* command);
Command::SubsystemSet m_subsystems;
wpi::mutex m_buttonsLock;
wpi::mutex m_buttonsMutex;
typedef std::vector<ButtonScheduler*> ButtonVector;
ButtonVector m_buttons;
typedef std::vector<Command*> CommandVector;
wpi::mutex m_additionsLock;
wpi::mutex m_additionsMutex;
CommandVector m_additions;
typedef std::set<Command*> CommandSet;
CommandSet m_commands;

2
wpilibc/src/main/native/include/MotorSafetyHelper.h
View File

@@ -41,7 +41,7 @@ class MotorSafetyHelper : public ErrorBase {
double m_stopTime;
// Protect accesses to the state for this object
mutable wpi::mutex m_syncMutex;
mutable wpi::mutex m_thisMutex;
// The object that is using the helper
MotorSafety* m_safeObject;