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

81
wpiutil/src/main/native/include/wpi/future.h
View File

@@ -294,7 +294,9 @@ class future final {
* Ignores the result of the future if it has not been retrieved.
*/
~future() {
if (m_promises) m_promises->IgnoreResult(m_request);
if (m_promises) {
m_promises->IgnoreResult(m_request);
}
}
future& operator=(future&& oth) noexcept {
@@ -313,10 +315,11 @@ class future final {
* @return The value provided by the corresponding promise.set_value().
*/
T get() {
if (m_promises)
if (m_promises) {
return m_promises->GetResult(m_request);
else
} else {
return T();
}
}
template <typename R, typename F>
@@ -355,7 +358,9 @@ class future final {
* If the value has already been provided, returns immediately.
*/
void wait() const {
if (m_promises) m_promises->WaitResult(m_request);
if (m_promises) {
m_promises->WaitResult(m_request);
}
}
/**
@@ -416,7 +421,9 @@ class future<void> final {
* Ignores the result of the future if it has not been retrieved.
*/
~future() {
if (m_promises) m_promises->IgnoreResult(m_request);
if (m_promises) {
m_promises->IgnoreResult(m_request);
}
}
future& operator=(future&& oth) noexcept {
@@ -433,7 +440,9 @@ class future<void> final {
* Can only be called once. The future will be marked invalid after the call.
*/
void get() {
if (m_promises) m_promises->GetResult(m_request);
if (m_promises) {
m_promises->GetResult(m_request);
}
}
template <typename R, typename F>
@@ -471,7 +480,9 @@ class future<void> final {
* If the value has already been provided, returns immediately.
*/
void wait() const {
if (m_promises) m_promises->WaitResult(m_request);
if (m_promises) {
m_promises->WaitResult(m_request);
}
}
/**
@@ -537,7 +548,9 @@ class promise final {
* Sets the promised value to a default-constructed T if not already set.
*/
~promise() {
if (m_promises) m_promises->SetValue(m_request, T());
if (m_promises) {
m_promises->SetValue(m_request, T());
}
}
promise& operator=(promise&& oth) noexcept {
@@ -572,7 +585,9 @@ class promise final {
* @param value The value to provide to the waiting future
*/
void set_value(const T& value) {
if (m_promises) m_promises->SetValue(m_request, value);
if (m_promises) {
m_promises->SetValue(m_request, value);
}
m_promises = nullptr;
}
@@ -583,7 +598,9 @@ class promise final {
* @param value The value to provide to the waiting future
*/
void set_value(T&& value) {
if (m_promises) m_promises->SetValue(m_request, std::move(value));
if (m_promises) {
m_promises->SetValue(m_request, std::move(value));
}
m_promises = nullptr;
}
@@ -622,7 +639,9 @@ class promise<void> final {
* Sets the promised value if not already set.
*/
~promise() {
if (m_promises) m_promises->SetValue(m_request);
if (m_promises) {
m_promises->SetValue(m_request);
}
}
promise& operator=(promise&& oth) noexcept {
@@ -657,7 +676,9 @@ class promise<void> final {
* Only effective once (subsequent calls will be ignored).
*/
void set_value() {
if (m_promises) m_promises->SetValue(m_request);
if (m_promises) {
m_promises->SetValue(m_request);
}
m_promises = nullptr;
}
@@ -707,7 +728,9 @@ inline promise<T> PromiseFactory<T>::CreatePromise(uint64_t request) {
template <typename T>
void PromiseFactory<T>::SetValue(uint64_t request, const T& value) {
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()) {
@@ -726,7 +749,9 @@ void PromiseFactory<T>::SetValue(uint64_t request, const T& value) {
template <typename T>
void PromiseFactory<T>::SetValue(uint64_t request, T&& value) {
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()) {
@@ -793,7 +818,9 @@ void PromiseFactory<T>::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.first == request; });
if (it != m_results.end()) return;
if (it != m_results.end()) {
return;
}
// No, keep waiting for a response
Wait(lock);
}
@@ -810,10 +837,16 @@ bool PromiseFactory<T>::WaitResultUntil(
// Did we get a response to *our* request?
auto it = std::find_if(m_results.begin(), m_results.end(),
[=](const auto& r) { return r.first == request; });
if (it != m_results.end()) return true;
if (timeout) break;
if (it != m_results.end()) {
return true;
}
if (timeout) {
break;
}
// No, keep waiting for a response
if (!WaitUntil(lock, timeout_time)) timeout = true;
if (!WaitUntil(lock, timeout_time)) {
timeout = true;
}
}
return false;
}
@@ -842,10 +875,16 @@ bool PromiseFactory<void>::WaitResultUntil(
// 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 true;
if (timeout) break;
if (it != m_results.end()) {
return true;
}
if (timeout) {
break;
}
// No, keep waiting for a response
if (!WaitUntil(lock, timeout_time)) timeout = true;
if (!WaitUntil(lock, timeout_time)) {
timeout = true;
}
}
return false;
}