clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: Ica590f8613f1fb89ab1ca676ac51c1cc7e38d67f
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/presence/anyof.cpp b/presence/anyof.cpp
index 6b9403a..635e6a6 100644
--- a/presence/anyof.cpp
+++ b/presence/anyof.cpp
@@ -36,8 +36,8 @@
AnyOf::AnyOf(const Fan& fan,
const std::vector<std::reference_wrapper<PresenceSensor>>& s,
std::unique_ptr<EEPROMDevice> e) :
- RedundancyPolicy(fan, std::move(e)),
- state(), _powerState(getPowerStateObject()),
+ RedundancyPolicy(fan, std::move(e)), state(),
+ _powerState(getPowerStateObject()),
_powerOnDelayTimer(sdeventplus::Event::get_default(),
std::bind(&AnyOf::delayedAfterPowerOn, this)),
_powerOn(false)
@@ -62,10 +62,10 @@
void AnyOf::stateChanged(bool present, PresenceSensor& sensor)
{
// Find the sensor that changed state.
- auto sit = std::find_if(state.begin(), state.end(),
- [&sensor](const auto& s) {
- return std::get<sensorPos>(s).get() == sensor;
- });
+ auto sit =
+ std::find_if(state.begin(), state.end(), [&sensor](const auto& s) {
+ return std::get<sensorPos>(s).get() == sensor;
+ });
if (sit != state.end())
{
auto origState =
@@ -139,9 +139,10 @@
// If at least one, but not all, sensors indicate present, then
// tell the not present ones to log a conflict if not already done.
- if (std::any_of(
- state.begin(), state.end(),
- [this](const auto& s) { return std::get<presentPos>(s); }) &&
+ if (std::any_of(state.begin(), state.end(),
+ [this](const auto& s) {
+ return std::get<presentPos>(s);
+ }) &&
!std::all_of(state.begin(), state.end(),
[this](const auto& s) { return std::get<presentPos>(s); }))
{