diff options
author | 2023-11-10 13:56:07 -0800 | |
---|---|---|
committer | 2024-01-17 23:52:44 -0800 | |
commit | 77e28bd5261e47775c8b65759320036a5fb52f15 (patch) | |
tree | ff23445c4e231978d9241a2c67b86139d5fdeb66 | |
parent | 342811136453f8b41c022411c6c3d9fd7f3b0826 (diff) |
[cleanup] Fix initializers order
Bug: 282215580
Test: build + boot + perf record
Change-Id: I5c76515aa3dad405a2938d8d0e87048cc52cf61b
-rw-r--r-- | cmds/idmap2/libidmap2/FabricatedOverlay.cpp | 4 | ||||
-rw-r--r-- | cmds/idmap2/libidmap2/ResourceContainer.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmds/idmap2/libidmap2/FabricatedOverlay.cpp b/cmds/idmap2/libidmap2/FabricatedOverlay.cpp index 16bb896e939c..55ea15d0cdf1 100644 --- a/cmds/idmap2/libidmap2/FabricatedOverlay.cpp +++ b/cmds/idmap2/libidmap2/FabricatedOverlay.cpp @@ -468,9 +468,9 @@ Result<OverlayData> FabContainer::GetOverlayData(const OverlayManifestInfo& info entry.name().c_str()); const auto& res_value = entry.res_value(); result.pairs.emplace_back(OverlayData::Value{ - name, TargetValueWithConfig{.config = entry.configuration(), .value = TargetValue{ + name, TargetValueWithConfig{.value = TargetValue{ .data_type = static_cast<uint8_t>(res_value.data_type()), - .data_value = res_value.data_value()}}}); + .data_value = res_value.data_value()}, .config = entry.configuration()}}); } } } diff --git a/cmds/idmap2/libidmap2/ResourceContainer.cpp b/cmds/idmap2/libidmap2/ResourceContainer.cpp index 7869fbdb8cea..9025b5bd2e6f 100644 --- a/cmds/idmap2/libidmap2/ResourceContainer.cpp +++ b/cmds/idmap2/libidmap2/ResourceContainer.cpp @@ -227,9 +227,9 @@ Result<OverlayData> CreateResourceMapping(ResourceId id, const ZipAssetsProvider } else { overlay_data.pairs.emplace_back( OverlayData::Value{*target_resource, TargetValueWithConfig{ - .config = std::string(), .value = TargetValue{.data_type = overlay_resource->dataType, - .data_value = overlay_resource->data}}}); + .data_value = overlay_resource->data}, + .config = std::string()}}); } } |