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

3
wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilderImpl.h
View File

@@ -180,8 +180,9 @@ class SendableBuilderImpl : public SendableBuilder {
~Property() { StopListener(); }
void StartListener() {
if (entry && listener == 0 && createListener)
if (entry && listener == 0 && createListener) {
listener = createListener(entry);
}
}
void StopListener() {

6
wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.inc
View File

@@ -31,7 +31,8 @@ auto SendableChooser<T>::GetSelected()
std::string selected = m_defaultChoice;
{
std::scoped_lock lock(m_mutex);
if (m_haveSelected) selected = m_selected;
if (m_haveSelected)
selected = m_selected;
}
if (selected.empty()) {
return decltype(_unwrap_smart_ptr(m_choices[""])){};
@@ -85,7 +86,8 @@ void SendableChooser<T>::InitSendable(SendableBuilder& builder) {
std::scoped_lock lock(m_mutex);
m_haveSelected = true;
m_selected = val;
for (auto& entry : m_activeEntries) entry.SetString(val);
for (auto& entry : m_activeEntries)
entry.SetString(val);
});
}