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

Replaced ::std with std for readability/consistency.

Browse Source 
Change-Id: I65f9673c237d3513f99827e28963eb22ae9df0c2
This commit is contained in:
James Kuszmaul
2015-07-29 16:48:04 -04:00
parent f74ca87e26
commit 4b575e3e7e
127 changed files with 404 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wpilibc/wpilibC++Sim/src/DriverStation.cpp
View File

@@ -99,7 +99,7 @@ float DriverStation::GetStickAxis(uint32_t stick, uint32_t axis)
return 0.0;
}
::std::unique_lock<::std::recursive_mutex> lock(m_joystickMutex);
std::unique_lock<std::recursive_mutex> lock(m_joystickMutex);
if (joysticks[stick] == nullptr || axis >= joysticks[stick]->axes().size())
{
return 0.0;
@@ -123,7 +123,7 @@ bool DriverStation::GetStickButton(uint32_t stick, uint32_t button)
return false;
}
::std::unique_lock<::std::recursive_mutex> lock(m_joystickMutex);
std::unique_lock<std::recursive_mutex> lock(m_joystickMutex);
if (joysticks[stick] == nullptr || button >= joysticks[stick]->buttons().size())
{
return false;
@@ -147,7 +147,7 @@ short DriverStation::GetStickButtons(uint32_t stick)
}
short btns = 0, btnid;
::std::unique_lock<::std::recursive_mutex> lock(m_joystickMutex);
std::unique_lock<std::recursive_mutex> lock(m_joystickMutex);
msgs::JoystickPtr joy = joysticks[stick];
for (btnid = 0; btnid < joy->buttons().size() && btnid < 12; btnid++)
{
@@ -215,7 +215,7 @@ bool DriverStation::GetDigitalOut(uint32_t channel)
bool DriverStation::IsEnabled() const
{
::std::unique_lock<::std::recursive_mutex> lock(m_stateMutex);
std::unique_lock<std::recursive_mutex> lock(m_stateMutex);
return state != nullptr ? state->enabled() : false;
}
@@ -226,7 +226,7 @@ bool DriverStation::IsDisabled() const
bool DriverStation::IsAutonomous() const
{
::std::unique_lock<::std::recursive_mutex> lock(m_stateMutex);
std::unique_lock<std::recursive_mutex> lock(m_stateMutex);
return state != nullptr ?
state->state() == msgs::DriverStation_State_AUTO : false;
}
@@ -238,7 +238,7 @@ bool DriverStation::IsOperatorControl() const
bool DriverStation::IsTest() const
{
::std::unique_lock<::std::recursive_mutex> lock(m_stateMutex);
std::unique_lock<std::recursive_mutex> lock(m_stateMutex);
return state != nullptr ?
state->state() == msgs::DriverStation_State_TEST : false;
}
@@ -283,7 +283,7 @@ uint32_t DriverStation::GetLocation() const
*/
void DriverStation::WaitForData()
{
::std::unique_lock<::std::mutex> lock(m_waitForDataMutex);
std::unique_lock<std::mutex> lock(m_waitForDataMutex);
m_waitForDataCond.wait(lock);
}
@@ -308,9 +308,9 @@ double DriverStation::GetMatchTime() const
* Report an error to the DriverStation messages window.
* The error is also printed to the program console.
*/
void DriverStation::ReportError(::std::string error)
void DriverStation::ReportError(std::string error)
{
::std::cout << error << ::std::endl;
std::cout << error << std::endl;
}
/**
@@ -325,7 +325,7 @@ uint16_t DriverStation::GetTeamNumber() const
void DriverStation::stateCallback(const msgs::ConstDriverStationPtr &msg)
{
{
::std::unique_lock<::std::recursive_mutex> lock(m_stateMutex);
std::unique_lock<std::recursive_mutex> lock(m_stateMutex);
*state = *msg;
}
m_waitForDataCond.notify_all();
@@ -334,7 +334,7 @@ void DriverStation::stateCallback(const msgs::ConstDriverStationPtr &msg)
void DriverStation::joystickCallback(const msgs::ConstJoystickPtr &msg,
int i)
{
::std::unique_lock<::std::recursive_mutex> lock(m_joystickMutex);
std::unique_lock<std::recursive_mutex> lock(m_joystickMutex);
*(joysticks[i]) = *msg;
}