clang-format: copy latest and re-format
clang-format-17 has some backwards incompatible changes that require
additional settings for best compatibility and re-running the formatter.
Copy the latest .clang-format from the docs repository and reformat the
repository.
Change-Id: I3e9e6350864ac267819a4b8d670bef7d3746976e
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/control/json/actions/default_floor.cpp b/control/json/actions/default_floor.cpp
index f1cc4af..95a2219 100644
--- a/control/json/actions/default_floor.cpp
+++ b/control/json/actions/default_floor.cpp
@@ -44,7 +44,7 @@
std::any_of(members.begin(), members.end(),
[&intf = group.getInterface()](const auto& member) {
return !Manager::hasOwner(member, intf);
- });
+ });
if (isMissingOwner)
{
zone.setFloor(zone.getDefaultFloor());
diff --git a/control/json/actions/mapped_floor.cpp b/control/json/actions/mapped_floor.cpp
index 97f659f..3de2188 100644
--- a/control/json/actions/mapped_floor.cpp
+++ b/control/json/actions/mapped_floor.cpp
@@ -237,7 +237,7 @@
{
value = static_cast<double>(val);
}
- },
+ },
value);
}
@@ -271,7 +271,7 @@
"isn't numeric",
ActionBase::getName(), group.getName())};
}
- },
+ },
value);
checked = true;
}
diff --git a/control/json/actions/missing_owner_target.cpp b/control/json/actions/missing_owner_target.cpp
index 2138a06..deed3cb 100644
--- a/control/json/actions/missing_owner_target.cpp
+++ b/control/json/actions/missing_owner_target.cpp
@@ -47,7 +47,7 @@
std::any_of(members.begin(), members.end(),
[&intf = group.getInterface()](const auto& member) {
return !Manager::hasOwner(member, intf);
- });
+ });
// Update zone's target hold based on action results
zone.setTargetHold(group.getName(), _target, isMissingOwner);
}
diff --git a/control/json/actions/override_fan_target.cpp b/control/json/actions/override_fan_target.cpp
index 33fbd34..103008a 100644
--- a/control/json/actions/override_fan_target.cpp
+++ b/control/json/actions/override_fan_target.cpp
@@ -87,8 +87,8 @@
{
fanList = std::accumulate(std::next(_fans.begin()), _fans.end(),
_fans[0], [](auto list, auto fan) {
- return std::move(list) + ", " + fan;
- });
+ return std::move(list) + ", " + fan;
+ });
}
record(std::format("Adding fan target lock of {} on fans [{}] zone {}",
diff --git a/control/json/actions/set_parameter_from_group_max.cpp b/control/json/actions/set_parameter_from_group_max.cpp
index 10c2b70..99e184f 100644
--- a/control/json/actions/set_parameter_from_group_max.cpp
+++ b/control/json/actions/set_parameter_from_group_max.cpp
@@ -77,7 +77,7 @@
.c_str());
invalid = true;
}
- },
+ },
value);
if (invalid)
{
diff --git a/control/json/actions/target_from_group_max.cpp b/control/json/actions/target_from_group_max.cpp
index 045b2d5..341c67d 100644
--- a/control/json/actions/target_from_group_max.cpp
+++ b/control/json/actions/target_from_group_max.cpp
@@ -197,7 +197,7 @@
.c_str());
invalid = true;
}
- },
+ },
value);
if (invalid)
{
diff --git a/control/json/actions/timer_based_actions.cpp b/control/json/actions/timer_based_actions.cpp
index 81d8fc1..02779bd 100644
--- a/control/json/actions/timer_based_actions.cpp
+++ b/control/json/actions/timer_based_actions.cpp
@@ -42,10 +42,9 @@
{
// If any of groups' value == nullopt(i.e. not configured), action is
// driven by the service owned state of the group members
- _byOwner = std::any_of(_groups.begin(), _groups.end(),
- [](const auto& group) {
- return group.getValue() == std::nullopt;
- });
+ _byOwner = std::any_of(
+ _groups.begin(), _groups.end(),
+ [](const auto& group) { return group.getValue() == std::nullopt; });
setTimerConf(jsonObj);
setActions(jsonObj);
@@ -58,12 +57,12 @@
// If any service providing a group member is not owned, start
// timer and if all members' services are owned, stop timer.
if (std::any_of(_groups.begin(), _groups.end(), [](const auto& group) {
- const auto& members = group.getMembers();
- return std::any_of(members.begin(), members.end(),
- [&group](const auto& member) {
+ const auto& members = group.getMembers();
+ return std::any_of(members.begin(), members.end(),
+ [&group](const auto& member) {
return !Manager::hasOwner(member, group.getInterface());
- });
- }))
+ });
+ }))
{
startTimer();
}
@@ -87,7 +86,7 @@
mgr->getProperty(member, group.getInterface(),
group.getProperty());
});
- }))
+ }))
{
// Timer will be started(and never stopped) when _groups is empty
startTimer();