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

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

8
wpilibc/shared/src/Commands/Scheduler.cpp
View File

@@ -41,7 +41,7 @@ void Scheduler::SetEnabled(bool enabled) { m_enabled = enabled; }
* @param command The command to be scheduled
*/
void Scheduler::AddCommand(Command* command) {
std::lock_guard<priority_mutex> sync(m_additionsLock);
std::lock_guard<hal::priority_mutex> sync(m_additionsLock);
if (std::find(m_additions.begin(), m_additions.end(), command) !=
m_additions.end())
return;
@@ -49,7 +49,7 @@ void Scheduler::AddCommand(Command* command) {
}
void Scheduler::AddButton(ButtonScheduler* button) {
std::lock_guard<priority_mutex> sync(m_buttonsLock);
std::lock_guard<hal::priority_mutex> sync(m_buttonsLock);
m_buttons.push_back(button);
}
@@ -115,7 +115,7 @@ void Scheduler::Run() {
{
if (!m_enabled) return;
std::lock_guard<priority_mutex> sync(m_buttonsLock);
std::lock_guard<hal::priority_mutex> sync(m_buttonsLock);
for (auto rButtonIter = m_buttons.rbegin(); rButtonIter != m_buttons.rend();
rButtonIter++) {
(*rButtonIter)->Execute();
@@ -138,7 +138,7 @@ void Scheduler::Run() {
// Add the new things
{
std::lock_guard<priority_mutex> sync(m_additionsLock);
std::lock_guard<hal::priority_mutex> sync(m_additionsLock);
for (auto additionsIter = m_additions.begin();
additionsIter != m_additions.end(); additionsIter++) {
ProcessCommandAddition(*additionsIter);