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/json/manager.hpp b/control/json/manager.hpp
index d7657e9..2f66181 100644
--- a/control/json/manager.hpp
+++ b/control/json/manager.hpp
@@ -198,8 +198,8 @@
* Map of configuration keys to their corresponding configuration object
*/
template <typename T, typename... Args>
- static std::map<configKey, std::unique_ptr<T>> getConfig(bool isOptional,
- Args&&... args)
+ static std::map<configKey, std::unique_ptr<T>>
+ getConfig(bool isOptional, Args&&... args)
{
std::map<configKey, std::unique_ptr<T>> config;
@@ -226,16 +226,18 @@
if (!profiles.empty() &&
!std::any_of(profiles.begin(), profiles.end(),
[](const auto& name) {
- return std::find(getActiveProfiles().begin(),
- getActiveProfiles().end(),
- name) != getActiveProfiles().end();
- }))
+ return std::find(
+ getActiveProfiles().begin(),
+ getActiveProfiles().end(),
+ name) !=
+ getActiveProfiles().end();
+ }))
{
continue;
}
}
- auto obj = std::make_unique<T>(entry,
- std::forward<Args>(args)...);
+ auto obj =
+ std::make_unique<T>(entry, std::forward<Args>(args)...);
config.emplace(
std::make_pair(obj->getName(), obj->getProfiles()),
std::move(obj));