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

Add braces to C++ single-line loops and conditionals (NFC) (#2973)

Browse Source 
This makes code easier to read and more consistent between C++ and Java.
Also update clang-format settings to always add a line break (even if no braces are used).
This commit is contained in:
Peter Johnson
2020-12-28 12:58:06 -08:00
committed by GitHub
parent 0291a3ff56
commit 2aed432b4b
634 changed files with 10716 additions and 3938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wpilibc/src/main/native/include/frc/RobotBase.h
View File

@@ -74,15 +74,18 @@ int StartRobot() {
HAL_RunMain();
// signal loop to exit
if (robot) robot->EndCompetition();
if (robot) {
robot->EndCompetition();
}
// prefer to join, but detach to exit if it doesn't exit in a timely manner
using namespace std::chrono_literals;
std::unique_lock lock{m};
if (cv.wait_for(lock, 1s, [] { return exited; }))
if (cv.wait_for(lock, 1s, [] { return exited; })) {
thr.join();
else
} else {
thr.detach();
}
} else {
impl::RunRobot<Robot>(m, &robot);
}