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

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

12
wpiutil/src/main/native/cpp/TCPConnector_parallel.cpp
View File

@@ -26,7 +26,9 @@ using namespace wpi;
std::unique_ptr<NetworkStream> TCPConnector::connect_parallel(
ArrayRef<std::pair<const char*, int>> servers, Logger& logger,
int timeout) {
if (servers.empty()) return nullptr;
if (servers.empty()) {
return nullptr;
}
// structure to make sure we don't start duplicate workers
struct GlobalState {
@@ -72,7 +74,9 @@ std::unique_ptr<NetworkStream> TCPConnector::connect_parallel(
// attempt to the same server
{
std::scoped_lock lock(local->mtx);
if (local->active.count(active_tracker) > 0) continue; // already in set
if (local->active.count(active_tracker) > 0) {
continue; // already in set
}
}
++num_workers;
@@ -99,7 +103,9 @@ std::unique_ptr<NetworkStream> TCPConnector::connect_parallel(
// successful connection
if (stream) {
std::scoped_lock lock(result->mtx);
if (!result->done.exchange(true)) result->stream = std::move(stream);
if (!result->done.exchange(true)) {
result->stream = std::move(stream);
}
}
}
++result->count;