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: I8078c8196a2d5706179dc10bf20c0af1a69ec962
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/manager.cpp b/manager.cpp
index 27e60eb..f9e40c6 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -131,10 +131,9 @@
}
}
-void Manager::updateInterfaces(const sdbusplus::message::object_path& path,
- const Object& interfaces,
- ObjectReferences::iterator pos, bool newObject,
- bool restoreFromCache)
+void Manager::updateInterfaces(
+ const sdbusplus::message::object_path& path, const Object& interfaces,
+ ObjectReferences::iterator pos, bool newObject, bool restoreFromCache)
{
auto& refaces = pos->second;
auto ifaceit = interfaces.cbegin();
@@ -318,8 +317,8 @@
const_cast<const Manager*>(this)->getInterfaceHolder(path, interface));
}
-const std::any& Manager::getInterfaceHolder(const char* path,
- const char* interface) const
+const std::any&
+ Manager::getInterfaceHolder(const char* path, const char* interface) const
{
std::string p{path};
auto oit = _refs.find(_root + p);
@@ -343,8 +342,8 @@
return;
}
- static const std::string remove = std::string(PIM_PERSIST_PATH) +
- INVENTORY_ROOT;
+ static const std::string remove =
+ std::string(PIM_PERSIST_PATH) + INVENTORY_ROOT;
std::map<sdbusplus::message::object_path, Object> objects;
for (const auto& dirent :
@@ -405,8 +404,8 @@
auto& getProperty =
std::get<GetPropertyValueType>(maker->second);
- condition.actualValue = getProperty(condition.property,
- ifaceIt->second);
+ condition.actualValue =
+ getProperty(condition.property, ifaceIt->second);
}
}
}
@@ -416,11 +415,11 @@
// associations file is valid so create its associations.
if (_associations.conditionMatch())
{
- std::for_each(_refs.begin(), _refs.end(),
- [this](const auto& ref) {
- _associations.createAssociations(
- ref.first, _status != ManagerStatus::RUNNING);
- });
+ std::for_each(
+ _refs.begin(), _refs.end(), [this](const auto& ref) {
+ _associations.createAssociations(
+ ref.first, _status != ManagerStatus::RUNNING);
+ });
}
}
#endif