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/control/zone.hpp b/control/zone.hpp
index ce9c6bf..dfa6efb 100644
--- a/control/zone.hpp
+++ b/control/zone.hpp
@@ -241,24 +241,24 @@
std::optional<T> value;
std::visit(
[&value](auto&& val) {
- // If the type configured is int64, but the sensor value
- // property's type is double, scale it by 1000 and return
- // the value as an int64 as configured.
- using V = std::decay_t<decltype(val)>;
- if constexpr (std::is_same_v<T, int64_t> &&
- std::is_same_v<V, double>)
- {
- val = val * 1000;
- value = std::lround(val);
- }
- // If the type configured matches the sensor value
- // property's type, just return the value as its
- // given type.
- else if constexpr (std::is_same_v<T, V>)
- {
- value = val;
- }
- },
+ // If the type configured is int64, but the sensor value
+ // property's type is double, scale it by 1000 and return
+ // the value as an int64 as configured.
+ using V = std::decay_t<decltype(val)>;
+ if constexpr (std::is_same_v<T, int64_t> &&
+ std::is_same_v<V, double>)
+ {
+ val = val * 1000;
+ value = std::lround(val);
+ }
+ // If the type configured matches the sensor value
+ // property's type, just return the value as its
+ // given type.
+ else if constexpr (std::is_same_v<T, V>)
+ {
+ value = val;
+ }
+ },
variant);
// Unable to return Sensor Value property
@@ -504,10 +504,9 @@
*
* @return - Iterator to the timer event
*/
- std::vector<TimerEvent>::iterator
- findTimer(const Group& eventGroup,
- const std::vector<Action>& eventActions,
- std::vector<TimerEvent>& eventTimers);
+ std::vector<TimerEvent>::iterator findTimer(
+ const Group& eventGroup, const std::vector<Action>& eventActions,
+ std::vector<TimerEvent>& eventTimers);
/**
* @brief Add a timer to the list of timer based events
@@ -628,12 +627,12 @@
// type(T) is available on this interface and read it
std::visit(
[&value](auto&& val) {
- using V = std::decay_t<decltype(val)>;
- if constexpr (std::is_same_v<T, V>)
- {
- value = val;
- }
- },
+ using V = std::decay_t<decltype(val)>;
+ if constexpr (std::is_same_v<T, V>)
+ {
+ value = val;
+ }
+ },
var);
return value;