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: If87740ef153661e338448c9de753cbd61fd164eb
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/health_metric_config.cpp b/health_metric_config.cpp
index c3b80ba..bb52331 100644
--- a/health_metric_config.cpp
+++ b/health_metric_config.cpp
@@ -43,11 +43,11 @@
{"Warning", ThresholdIntf::Type::Warning}};
// Valid metrics from config
-static const auto validTypes =
- std::unordered_map<std::string, Type>{{"CPU", Type::cpu},
- {"Memory", Type::memory},
- {"Storage", Type::storage},
- {"Inode", Type::inode}};
+static const auto validTypes = std::unordered_map<std::string, Type>{
+ {"CPU", Type::cpu},
+ {"Memory", Type::memory},
+ {"Storage", Type::storage},
+ {"Inode", Type::inode}};
// Valid submetrics from config
static const auto validSubTypes = std::unordered_map<std::string, SubType>{
@@ -73,8 +73,8 @@
/** Deserialize a HealthMetric from JSON. */
void from_json(const json& j, HealthMetric& self)
{
- self.windowSize = j.value("Window_size",
- HealthMetric::defaults::windowSize);
+ self.windowSize =
+ j.value("Window_size", HealthMetric::defaults::windowSize);
self.hysteresis = j.value("Hysteresis", HealthMetric::defaults::hysteresis);
// Path is only valid for storage
self.path = j.value("Path", "");
@@ -101,8 +101,8 @@
static constexpr auto keyDelimiter = "_";
std::string typeStr = key.substr(0, key.find_first_of(keyDelimiter));
- std::string boundStr = key.substr(key.find_last_of(keyDelimiter) + 1,
- key.length());
+ std::string boundStr =
+ key.substr(key.find_last_of(keyDelimiter) + 1, key.length());
self.thresholds.emplace(
std::make_tuple(validThresholdTypes.at(typeStr),
@@ -184,8 +184,8 @@
config.name = name;
auto subType = validSubTypes.find(name);
- config.subType = (subType != validSubTypes.end() ? subType->second
- : SubType::NA);
+ config.subType =
+ (subType != validSubTypes.end() ? subType->second : SubType::NA);
configs[type->second].emplace_back(std::move(config));
}