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: I08efc0671773edfae814ebcda5c01389155e2cac
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/item_updater.cpp b/src/item_updater.cpp
index dd6ffd4..03b4add 100644
--- a/src/item_updater.cpp
+++ b/src/item_updater.cpp
@@ -97,9 +97,9 @@
AssociationList associations;
auto activationState = Activation::Status::Ready;
- associations.emplace_back(std::make_tuple(ACTIVATION_FWD_ASSOCIATION,
- ACTIVATION_REV_ASSOCIATION,
- PSU_INVENTORY_PATH_BASE));
+ associations.emplace_back(std::make_tuple(
+ ACTIVATION_FWD_ASSOCIATION, ACTIVATION_REV_ASSOCIATION,
+ PSU_INVENTORY_PATH_BASE));
fs::path manifestPath(filePath);
manifestPath /= MANIFEST_FILE;
@@ -111,8 +111,8 @@
activationState, associations, filePath);
activations.emplace(versionId, std::move(activation));
- auto versionPtr = createVersionObject(path, versionId, version,
- purpose);
+ auto versionPtr =
+ createVersionObject(path, versionId, version, purpose);
versions.emplace(versionId, std::move(versionPtr));
}
return;
@@ -226,9 +226,9 @@
{
// The versionId is already created, associate the path
auto associations = it->second->associations();
- associations.emplace_back(std::make_tuple(ACTIVATION_FWD_ASSOCIATION,
- ACTIVATION_REV_ASSOCIATION,
- psuInventoryPath));
+ associations.emplace_back(
+ std::make_tuple(ACTIVATION_FWD_ASSOCIATION,
+ ACTIVATION_REV_ASSOCIATION, psuInventoryPath));
it->second->associations(associations);
psuPathActivationMap.emplace(psuInventoryPath, it->second);
}
@@ -238,9 +238,9 @@
AssociationList associations;
auto activationState = Activation::Status::Active;
- associations.emplace_back(std::make_tuple(ACTIVATION_FWD_ASSOCIATION,
- ACTIVATION_REV_ASSOCIATION,
- psuInventoryPath));
+ associations.emplace_back(
+ std::make_tuple(ACTIVATION_FWD_ASSOCIATION,
+ ACTIVATION_REV_ASSOCIATION, psuInventoryPath));
auto activation = createActivationObject(
path, versionId, "", activationState, associations, "");
@@ -498,8 +498,8 @@
objPath, versionId, extVersion, activationState, {}, path);
activations.emplace(versionId, std::move(activation));
- auto versionPtr = createVersionObject(objPath, versionId,
- version, purpose);
+ auto versionPtr =
+ createVersionObject(objPath, versionId, version, purpose);
versions.emplace(versionId, std::move(versionPtr));
}
else