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: Id49ad73c860533f4658c909e86d6dc8e1423efb4
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/overlay.cpp b/src/overlay.cpp
index 8df8c8f..f6d2476 100644
--- a/src/overlay.cpp
+++ b/src/overlay.cpp
@@ -164,13 +164,12 @@
return std::filesystem::exists(dirPath, ec);
}
-static int buildDevice(const std::string& name, const std::string& busPath,
- const std::string& parameters, uint64_t bus,
- uint64_t address, const std::string& constructor,
- const std::string& destructor,
- const devices::createsHWMon hasHWMonDir,
- std::vector<std::string> channelNames,
- const size_t retries = 5)
+static int
+ buildDevice(const std::string& name, const std::string& busPath,
+ const std::string& parameters, uint64_t bus, uint64_t address,
+ const std::string& constructor, const std::string& destructor,
+ const devices::createsHWMon hasHWMonDir,
+ std::vector<std::string> channelNames, const size_t retries = 5)
{
if (retries == 0U)
{
@@ -196,15 +195,15 @@
constructor, destructor, hasHWMonDir,
channelNames(std::move(channelNames)),
retries](const boost::system::error_code& ec) mutable {
- if (ec)
- {
- std::cerr << "Timer error: " << ec << "\n";
- return -2;
- }
- return buildDevice(name, busPath, parameters, bus, address,
- constructor, destructor, hasHWMonDir,
- std::move(channelNames), retries - 1);
- });
+ if (ec)
+ {
+ std::cerr << "Timer error: " << ec << "\n";
+ return -2;
+ }
+ return buildDevice(name, busPath, parameters, bus, address,
+ constructor, destructor, hasHWMonDir,
+ std::move(channelNames), retries - 1);
+ });
return -1;
}
}