Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21: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

16
wpiutil/src/main/native/cpp/future.cpp
View File

@@ -25,10 +25,14 @@ uint64_t PromiseFactoryBase::CreateRequest() {
}
bool PromiseFactoryBase::EraseRequest(uint64_t request) {
if (request == 0) return false;
if (request == 0) {
return false;
}
auto it = std::find_if(m_requests.begin(), m_requests.end(),
[=](auto r) { return r == request; });
if (it == m_requests.end()) return false; // no waiters
if (it == m_requests.end()) {
return false; // no waiters
}
m_requests.erase(it);
return true;
}
@@ -44,7 +48,9 @@ future<void> PromiseFactory<void>::MakeReadyFuture() {
void PromiseFactory<void>::SetValue(uint64_t request) {
std::unique_lock lock(GetResultMutex());
if (!EraseRequest(request)) return;
if (!EraseRequest(request)) {
return;
}
auto it = std::find_if(m_thens.begin(), m_thens.end(),
[=](const auto& x) { return x.request == request; });
if (it != m_thens.end()) {
@@ -102,7 +108,9 @@ void PromiseFactory<void>::WaitResult(uint64_t request) {
// Did we get a response to *our* request?
auto it = std::find_if(m_results.begin(), m_results.end(),
[=](const auto& r) { return r == request; });
if (it != m_results.end()) return;
if (it != m_results.end()) {
return;
}
// No, keep waiting for a response
Wait(lock);
}