diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2023-05-12 18:27:39 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2023-05-12 19:15:54 +0300 |
commit | b2ba30728fc644b206af43b3f807098b5fa470b6 (patch) | |
tree | 666c31daacab45762c400c51bbcd6c6eecf24a0e | |
parent | bc6cfec54c5c56e12e37e85db46d8b0d342090a9 (diff) | |
download | bmcweb-b2ba30728fc644b206af43b3f807098b5fa470b6.tar.xz |
fix more push vs emplace calls
It seems like clang-tidy doesn't catch every place that an emplace could
be used instead of a push. Use a few grep/sed pairs to find and fix up
some common patterns.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I93eaec26b8e3be240599e92b66cf54947073dc4c
25 files changed, 66 insertions, 66 deletions
diff --git a/include/ibm/management_console_rest.hpp b/include/ibm/management_console_rest.hpp index c2bf14af0c..edf64a4324 100644 --- a/include/ibm/management_console_rest.hpp +++ b/include/ibm/management_console_rest.hpp @@ -246,8 +246,8 @@ inline void const std::filesystem::path& pathObj = file.path(); if (std::filesystem::is_regular_file(pathObj)) { - pathObjList.push_back("/ibm/v1/Host/ConfigFiles/" + - pathObj.filename().string()); + pathObjList.emplace_back("/ibm/v1/Host/ConfigFiles/" + + pathObj.filename().string()); } } } diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp index 82e3ecd8c1..51257642cb 100644 --- a/include/openbmc_dbus_rest.hpp +++ b/include/openbmc_dbus_rest.hpp @@ -144,7 +144,7 @@ inline void nlohmann::json::object_t object; object["path"] = objectPath; - transaction->res.jsonValue["objects"].push_back(std::move(object)); + transaction->res.jsonValue["objects"].emplace_back(std::move(object)); tinyxml2::XMLDocument doc; @@ -1356,7 +1356,7 @@ inline void handleMethodResponse( { for (auto& obj : data) { - transaction->methodResponse.push_back(std::move(obj)); + transaction->methodResponse.emplace_back(std::move(obj)); } return; } @@ -1366,13 +1366,13 @@ inline void handleMethodResponse( // They are different types. May as well turn them into an array nlohmann::json j = std::move(transaction->methodResponse); transaction->methodResponse = nlohmann::json::array(); - transaction->methodResponse.push_back(std::move(j)); - transaction->methodResponse.push_back(std::move(data)); + transaction->methodResponse.emplace_back(std::move(j)); + transaction->methodResponse.emplace_back(std::move(data)); transaction->convertedToArray = true; } else { - transaction->methodResponse.push_back(std::move(data)); + transaction->methodResponse.emplace_back(std::move(data)); } } @@ -2199,7 +2199,7 @@ inline void { nlohmann::json::object_t interfaceObj; interfaceObj["name"] = ifaceName; - interfacesArray.push_back(std::move(interfaceObj)); + interfacesArray.emplace_back(std::move(interfaceObj)); } interface = interface->NextSiblingElement("interface"); @@ -2291,7 +2291,7 @@ inline void thisArg[fieldName] = fieldValue; } } - argsArray.push_back(std::move(thisArg)); + argsArray.emplace_back(std::move(thisArg)); arg = arg->NextSiblingElement("arg"); } @@ -2314,7 +2314,7 @@ inline void object["uri"] = std::move(uri); object["args"] = argsArray; - methodsArray.push_back(std::move(object)); + methodsArray.emplace_back(std::move(object)); } methods = methods->NextSiblingElement("method"); } @@ -2344,7 +2344,7 @@ inline void nlohmann::json::object_t object; object["name"] = name; object["args"] = argsArray; - signalsArray.push_back(std::move(object)); + signalsArray.emplace_back(std::move(object)); } signals = signals->NextSiblingElement("signal"); @@ -2461,7 +2461,7 @@ inline void requestRoutes(App& app) { nlohmann::json::object_t object; object["name"] = name; - objectsSub.push_back(std::move(object)); + objectsSub.emplace_back(std::move(object)); } } }; diff --git a/include/persistent_data.hpp b/include/persistent_data.hpp index e93d216827..4344074a14 100644 --- a/include/persistent_data.hpp +++ b/include/persistent_data.hpp @@ -243,7 +243,7 @@ class ConfigFile { session["client_id"] = *p.second->clientId; } - sessions.push_back(std::move(session)); + sessions.emplace_back(std::move(session)); } } nlohmann::json& subscriptions = data["subscriptions"]; @@ -286,7 +286,7 @@ class ConfigFile subscription["MetricReportDefinitions"] = subValue->metricReportDefinitions; - subscriptions.push_back(std::move(subscription)); + subscriptions.emplace_back(std::move(subscription)); } persistentFile << data; } diff --git a/redfish-core/include/redfish_aggregator.hpp b/redfish-core/include/redfish_aggregator.hpp index 896eb4aac5..1c514ecced 100644 --- a/redfish-core/include/redfish_aggregator.hpp +++ b/redfish-core/include/redfish_aggregator.hpp @@ -953,7 +953,7 @@ class RedfishAggregator auto& satMembers = jsonVal["Members"]; for (auto& satMem : satMembers) { - members.push_back(std::move(satMem)); + members.emplace_back(std::move(satMem)); } asyncResp->res.jsonValue["Members@odata.count"] = members.size(); diff --git a/redfish-core/include/utils/collection.hpp b/redfish-core/include/utils/collection.hpp index f2f0669d11..05e4b4df2f 100644 --- a/redfish-core/include/utils/collection.hpp +++ b/redfish-core/include/utils/collection.hpp @@ -80,7 +80,7 @@ inline void crow::utility::appendUrlPieces(url, leaf); nlohmann::json::object_t member; member["@odata.id"] = std::move(url); - members.push_back(std::move(member)); + members.emplace_back(std::move(member)); } aResp->res.jsonValue["Members@odata.count"] = members.size(); }); diff --git a/redfish-core/include/utils/sw_utils.hpp b/redfish-core/include/utils/sw_utils.hpp index 7c746a0b1d..28cb41bf25 100644 --- a/redfish-core/include/utils/sw_utils.hpp +++ b/redfish-core/include/utils/sw_utils.hpp @@ -199,7 +199,7 @@ inline void member["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "UpdateService", "FirmwareInventory", swId); - softwareImageMembers.push_back(std::move(member)); + softwareImageMembers.emplace_back(std::move(member)); aResp->res .jsonValue["Links"]["SoftwareImages@odata.count"] = softwareImageMembers.size(); diff --git a/redfish-core/lib/account_service.hpp b/redfish-core/lib/account_service.hpp index c9d4eb840d..8a68aaeee0 100644 --- a/redfish-core/lib/account_service.hpp +++ b/redfish-core/lib/account_service.hpp @@ -404,7 +404,7 @@ inline void handleRoleMapPatch( nlohmann::json::object_t roleMapEntry; roleMapEntry["LocalRole"] = *localRole; roleMapEntry["RemoteGroup"] = *remoteGroup; - remoteRoleJson.push_back(std::move(roleMapEntry)); + remoteRoleJson.emplace_back(std::move(roleMapEntry)); }, ldapDbusService, dbusObjectPath, ldapPrivMapperInterface, "Create", *remoteGroup, @@ -1585,7 +1585,7 @@ inline void handleAccountCollectionGet( nlohmann::json::object_t member; member["@odata.id"] = "/redfish/v1/AccountService/Accounts/" + user; - memberArray.push_back(std::move(member)); + memberArray.emplace_back(std::move(member)); } } asyncResp->res.jsonValue["Members@odata.count"] = memberArray.size(); diff --git a/redfish-core/lib/certificate_service.hpp b/redfish-core/lib/certificate_service.hpp index 4e030d2297..9aa2145c52 100644 --- a/redfish-core/lib/certificate_service.hpp +++ b/redfish-core/lib/certificate_service.hpp @@ -725,7 +725,7 @@ inline void { if (optKeyUsage->empty()) { - optKeyUsage->push_back("ServerAuthentication"); + optKeyUsage->emplace_back("ServerAuthentication"); } else if (optKeyUsage->size() == 1) { @@ -748,7 +748,7 @@ inline void { if (optKeyUsage->empty()) { - optKeyUsage->push_back("ClientAuthentication"); + optKeyUsage->emplace_back("ClientAuthentication"); } else if (optKeyUsage->size() == 1) { diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp index e4e7b5af85..0ea53e2992 100644 --- a/redfish-core/lib/ethernet.hpp +++ b/redfish-core/lib/ethernet.hpp @@ -1667,7 +1667,7 @@ inline void parseInterfaceData( ipv4StaticArray.push_back(ipv4); } - ipv4Array.push_back(std::move(ipv4)); + ipv4Array.emplace_back(std::move(ipv4)); } std::string ipv6GatewayStr = ethData.ipv6DefaultGateway; @@ -1692,13 +1692,13 @@ inline void parseInterfaceData( ipv6["PrefixLength"] = ipv6Config.prefixLength; ipv6["AddressOrigin"] = ipv6Config.origin; - ipv6Array.push_back(std::move(ipv6)); + ipv6Array.emplace_back(std::move(ipv6)); if (ipv6Config.origin == "Static") { nlohmann::json::object_t ipv6Static; ipv6Static["Address"] = ipv6Config.address; ipv6Static["PrefixLength"] = ipv6Config.prefixLength; - ipv6StaticArray.push_back(std::move(ipv6Static)); + ipv6StaticArray.emplace_back(std::move(ipv6Static)); } } } @@ -1753,7 +1753,7 @@ inline void requestEthernetInterfacesRoutes(App& app) iface["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "Managers", "bmc", "EthernetInterfaces", ifaceItem); - ifaceArray.push_back(std::move(iface)); + ifaceArray.emplace_back(std::move(iface)); } } @@ -2176,7 +2176,7 @@ inline void requestEthernetInterfacesRoutes(App& app) "redfish", "v1", "Managers", "bmc", "EthernetInterfaces", rootInterfaceName, "VLANs", ifaceItem); - ifaceArray.push_back(std::move(iface)); + ifaceArray.emplace_back(std::move(iface)); } } diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp index 82004e0960..f74f215341 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp @@ -211,7 +211,7 @@ inline void requestRoutesEventDestinationCollection(App& app) nlohmann::json::object_t member; member["@odata.id"] = "/redfish/v1/EventService/Subscriptions/" + id; - memberArray.push_back(std::move(member)); + memberArray.emplace_back(std::move(member)); } }); BMCWEB_ROUTE(app, "/redfish/v1/EventService/Subscriptions/") diff --git a/redfish-core/lib/hypervisor_system.hpp b/redfish-core/lib/hypervisor_system.hpp index ec59140c7f..84563ba2da 100644 --- a/redfish-core/lib/hypervisor_system.hpp +++ b/redfish-core/lib/hypervisor_system.hpp @@ -510,7 +510,7 @@ inline void parseInterfaceData( { ipv4StaticArray.push_back(ipv4); } - ipv4Array.push_back(std::move(ipv4)); + ipv4Array.emplace_back(std::move(ipv4)); } } } @@ -764,7 +764,7 @@ inline void handleHypervisorEthernetInterfaceCollectionGet( ethIface["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "Systems", "hypervisor", "EthernetInterfaces", name); - ifaceArray.push_back(std::move(ethIface)); + ifaceArray.emplace_back(std::move(ethIface)); } asyncResp->res.jsonValue["Members@odata.count"] = ifaceArray.size(); }); diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp index c52c99ba55..c6b1354766 100644 --- a/redfish-core/lib/log_services.hpp +++ b/redfish-core/lib/log_services.hpp @@ -563,7 +563,7 @@ inline void "/attachment"; thisEntry["AdditionalDataSizeBytes"] = size; } - entriesArray.push_back(std::move(thisEntry)); + entriesArray.emplace_back(std::move(thisEntry)); } asyncResp->res.jsonValue["Members@odata.count"] = entriesArray.size(); }, @@ -1102,25 +1102,25 @@ inline void requestRoutesSystemLogServiceCollection(App& app) nlohmann::json::object_t eventLog; eventLog["@odata.id"] = "/redfish/v1/Systems/system/LogServices/EventLog"; - logServiceArray.push_back(std::move(eventLog)); + logServiceArray.emplace_back(std::move(eventLog)); #ifdef BMCWEB_ENABLE_REDFISH_DUMP_LOG nlohmann::json::object_t dumpLog; dumpLog["@odata.id"] = "/redfish/v1/Systems/system/LogServices/Dump"; - logServiceArray.push_back(std::move(dumpLog)); + logServiceArray.emplace_back(std::move(dumpLog)); #endif #ifdef BMCWEB_ENABLE_REDFISH_CPU_LOG nlohmann::json::object_t crashdump; crashdump["@odata.id"] = "/redfish/v1/Systems/system/LogServices/Crashdump"; - logServiceArray.push_back(std::move(crashdump)); + logServiceArray.emplace_back(std::move(crashdump)); #endif #ifdef BMCWEB_ENABLE_REDFISH_HOST_LOGGER nlohmann::json::object_t hostlogger; hostlogger["@odata.id"] = "/redfish/v1/Systems/system/LogServices/HostLogger"; - logServiceArray.push_back(std::move(hostlogger)); + logServiceArray.emplace_back(std::move(hostlogger)); #endif asyncResp->res.jsonValue["Members@odata.count"] = logServiceArray.size(); @@ -1148,7 +1148,7 @@ inline void requestRoutesSystemLogServiceCollection(App& app) member["@odata.id"] = "/redfish/v1/Systems/system/LogServices/PostCodes"; - logServiceArrayLocal.push_back(std::move(member)); + logServiceArrayLocal.emplace_back(std::move(member)); asyncResp->res.jsonValue["Members@odata.count"] = logServiceArrayLocal.size(); @@ -1443,7 +1443,7 @@ inline void requestRoutesJournalEventLogEntryCollection(App& app) continue; } - logEntryArray.push_back(std::move(bmcLogEntry)); + logEntryArray.emplace_back(std::move(bmcLogEntry)); } } asyncResp->res.jsonValue["Members@odata.count"] = entryCount; @@ -2203,7 +2203,7 @@ inline void requestRoutesSystemHostLoggerCollection(App& app) nlohmann::json::object_t hostLogEntry; fillHostLoggerEntryJson(std::to_string(skip + i), logEntries[i], hostLogEntry); - logEntryArray.push_back(std::move(hostLogEntry)); + logEntryArray.emplace_back(std::move(hostLogEntry)); } asyncResp->res.jsonValue["Members@odata.count"] = logCount; @@ -2305,7 +2305,7 @@ inline void handleBMCLogServicesCollectionGet( #ifdef BMCWEB_ENABLE_REDFISH_BMC_JOURNAL nlohmann::json::object_t journal; journal["@odata.id"] = "/redfish/v1/Managers/bmc/LogServices/Journal"; - logServiceArray.push_back(std::move(journal)); + logServiceArray.emplace_back(std::move(journal)); #endif asyncResp->res.jsonValue["Members@odata.count"] = logServiceArray.size(); @@ -2338,14 +2338,14 @@ inline void handleBMCLogServicesCollectionGet( nlohmann::json::object_t member; member["@odata.id"] = "/redfish/v1/Managers/bmc/LogServices/Dump"; - logServiceArrayLocal.push_back(std::move(member)); + logServiceArrayLocal.emplace_back(std::move(member)); } else if (path == "/xyz/openbmc_project/dump/faultlog") { nlohmann::json::object_t member; member["@odata.id"] = "/redfish/v1/Managers/bmc/LogServices/FaultLog"; - logServiceArrayLocal.push_back(std::move(member)); + logServiceArrayLocal.emplace_back(std::move(member)); } } @@ -2529,7 +2529,7 @@ inline void requestRoutesBMCJournalLogEntryCollection(App& app) messages::internalError(asyncResp->res); return; } - logEntryArray.push_back(std::move(bmcJournalLogEntry)); + logEntryArray.emplace_back(std::move(bmcJournalLogEntry)); } asyncResp->res.jsonValue["Members@odata.count"] = entryCount; if (skip + top < entryCount) @@ -3810,7 +3810,7 @@ static bool fillPostCodeEntry( } nlohmann::json& logEntryArray = aResp->res.jsonValue["Members"]; - logEntryArray.push_back(std::move(bmcLogEntry)); + logEntryArray.emplace_back(std::move(bmcLogEntry)); } // Return value is always false when querying multiple entries diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp index 1319eca53e..819a788997 100644 --- a/redfish-core/lib/managers.hpp +++ b/redfish-core/lib/managers.hpp @@ -542,7 +542,7 @@ inline void nlohmann::json::object_t step; step["Target"] = (*keys)[ii]; step["Output"] = (*values)[ii]; - steps.push_back(std::move(step)); + steps.emplace_back(std::move(step)); } } } @@ -592,7 +592,7 @@ inline void itemCopy) .to_string()); input["@odata.id"] = std::move(managerUrl); - data.push_back(std::move(input)); + data.emplace_back(std::move(input)); } } // todo(james): may never happen, but this diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp index d12ba103f3..7ae80d7265 100644 --- a/redfish-core/lib/metric_report.hpp +++ b/redfish-core/lib/metric_report.hpp @@ -35,7 +35,7 @@ inline nlohmann::json toMetricValues(const Readings& readings) metricReport["MetricValue"] = std::to_string(sensorValue); metricReport["Timestamp"] = redfish::time_utils::getDateTimeUintMs(timestamp); - metricValues.push_back(std::move(metricReport)); + metricValues.emplace_back(std::move(metricReport)); } return metricValues; diff --git a/redfish-core/lib/metric_report_definition.hpp b/redfish-core/lib/metric_report_definition.hpp index b184889cc4..d5d60eda39 100644 --- a/redfish-core/lib/metric_report_definition.hpp +++ b/redfish-core/lib/metric_report_definition.hpp @@ -87,7 +87,7 @@ inline void nlohmann::json::object_t metric; metric["MetricId"] = metricId; metric["MetricProperties"] = nlohmann::json::array_t({metadata}); - metrics.push_back(std::move(metric)); + metrics.emplace_back(std::move(metric)); } } diff --git a/redfish-core/lib/pcie.hpp b/redfish-core/lib/pcie.hpp index f2aceccf61..4ea2dbc797 100644 --- a/redfish-core/lib/pcie.hpp +++ b/redfish-core/lib/pcie.hpp @@ -129,7 +129,7 @@ static inline void nlohmann::json::object_t pcieDevice; pcieDevice["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "Systems", "system", "PCIeDevices", devName); - pcieDeviceList.push_back(std::move(pcieDevice)); + pcieDeviceList.emplace_back(std::move(pcieDevice)); } asyncResp->res.jsonValue[name + "@odata.count"] = pcieDeviceList.size(); }); @@ -450,7 +450,7 @@ inline void addPCIeFunctionList( pcieFunction["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "Systems", "system", "PCIeDevices", pcieDeviceId, "PCIeFunctions", std::to_string(functionNum)); - pcieFunctionList.push_back(std::move(pcieFunction)); + pcieFunctionList.emplace_back(std::move(pcieFunction)); } res.jsonValue["PCIeFunctions@odata.count"] = pcieFunctionList.size(); } diff --git a/redfish-core/lib/power.hpp b/redfish-core/lib/power.hpp index a0eadf56f9..3072b89545 100644 --- a/redfish-core/lib/power.hpp +++ b/redfish-core/lib/power.hpp @@ -221,7 +221,7 @@ inline void requestRoutesPower(App& app) "/Power#/PowerControl/0"; powerControl["Name"] = "Chassis Power Control"; powerControl["MemberId"] = "0"; - tempArray.push_back(std::move(powerControl)); + tempArray.emplace_back(std::move(powerControl)); } nlohmann::json& sensorJson = tempArray.back(); diff --git a/redfish-core/lib/processor.hpp b/redfish-core/lib/processor.hpp index 205578c947..122387515d 100644 --- a/redfish-core/lib/processor.hpp +++ b/redfish-core/lib/processor.hpp @@ -880,7 +880,7 @@ inline void nlohmann::json::object_t turbo; turbo["ActiveCoreCount"] = coreCount; turbo["MaxSpeedMHz"] = turboSpeed; - turboArray.push_back(std::move(turbo)); + turboArray.emplace_back(std::move(turbo)); } } @@ -895,7 +895,7 @@ inline void speed["CoreCount"] = coreList.size(); speed["CoreIDs"] = coreList; speed["BaseSpeedMHz"] = baseSpeedMhz; - baseSpeedArray.push_back(std::move(speed)); + baseSpeedArray.emplace_back(std::move(speed)); } } }); diff --git a/redfish-core/lib/redfish_sessions.hpp b/redfish-core/lib/redfish_sessions.hpp index e55314a67f..9fc08326ca 100644 --- a/redfish-core/lib/redfish_sessions.hpp +++ b/redfish-core/lib/redfish_sessions.hpp @@ -128,7 +128,7 @@ inline nlohmann::json getSessionCollectionMembers() nlohmann::json::object_t session; session["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "SessionService", "Sessions", *uid); - ret.push_back(std::move(session)); + ret.emplace_back(std::move(session)); } return ret; } diff --git a/redfish-core/lib/roles.hpp b/redfish-core/lib/roles.hpp index c9823477ed..a3382e8af7 100644 --- a/redfish-core/lib/roles.hpp +++ b/redfish-core/lib/roles.hpp @@ -139,7 +139,7 @@ inline void requestRoutesRoleCollection(App& app) nlohmann::json::object_t member; member["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "AccountService", "Roles", role); - memberArray.push_back(std::move(member)); + memberArray.emplace_back(std::move(member)); } } asyncResp->res.jsonValue["Members@odata.count"] = diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp index e04eac671f..93e8196de5 100644 --- a/redfish-core/lib/sensors.hpp +++ b/redfish-core/lib/sensors.hpp @@ -1134,7 +1134,7 @@ inline void populateFanRedundancy( redundancy["Status"]["Health"] = health; redundancy["Status"]["State"] = "Enabled"; - jResp.push_back(std::move(redundancy)); + jResp.emplace_back(std::move(redundancy)); }); }); } @@ -2386,7 +2386,7 @@ inline void getSensorData( url.set_fragment((""_json_pointer / fieldName / "0") .to_string()); power["@odata.id"] = std::move(url); - tempArray.push_back(std::move(power)); + tempArray.emplace_back(std::move(power)); } sensorJson = &(tempArray.back()); } @@ -2415,7 +2415,7 @@ inline void getSensorData( "redfish", "v1", "Chassis", sensorsAsyncResp->chassisId, sensorsAsyncResp->chassisSubNode, sensorId); - tempArray.push_back(std::move(member)); + tempArray.emplace_back(std::move(member)); sensorJson = &(tempArray.back()); } else @@ -2428,7 +2428,7 @@ inline void getSensorData( url.set_fragment( (""_json_pointer / fieldName).to_string()); member["@odata.id"] = std::move(url); - tempArray.push_back(std::move(member)); + tempArray.emplace_back(std::move(member)); sensorJson = &(tempArray.back()); } } @@ -2796,7 +2796,7 @@ inline void getChassisCallback( member["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "Chassis", chassisId, chassisSubNode, id); - entriesArray.push_back(std::move(member)); + entriesArray.emplace_back(std::move(member)); } asyncResp->res.jsonValue["Members@odata.count"] = entriesArray.size(); diff --git a/redfish-core/lib/storage.hpp b/redfish-core/lib/storage.hpp index 7182317540..63f96b6c1c 100644 --- a/redfish-core/lib/storage.hpp +++ b/redfish-core/lib/storage.hpp @@ -105,7 +105,7 @@ inline void getDrives(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, driveJson["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "Systems", "system", "Storage", "1", "Drives", object.filename()); - driveArray.push_back(std::move(driveJson)); + driveArray.emplace_back(std::move(driveJson)); } count = driveArray.size(); @@ -731,7 +731,7 @@ inline void chassisDriveCollectionGet( member["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "Chassis", chassisId, "Drives", leafName); - members.push_back(std::move(member)); + members.emplace_back(std::move(member)); // navigation links will be registered in next patch set } asyncResp->res.jsonValue["Members@odata.count"] = resp.size(); diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp index 1586ac4394..c474d08993 100644 --- a/redfish-core/lib/systems.hpp +++ b/redfish-core/lib/systems.hpp @@ -2770,14 +2770,14 @@ inline void requestRoutesSystemsCollection(App& app) nlohmann::json::object_t system; system["@odata.id"] = "/redfish/v1/Systems/system"; - ifaceArray.push_back(std::move(system)); + ifaceArray.emplace_back(std::move(system)); count = ifaceArray.size(); if (!ec2) { BMCWEB_LOG_DEBUG << "Hypervisor is available"; nlohmann::json::object_t hypervisor; hypervisor["@odata.id"] = "/redfish/v1/Systems/hypervisor"; - ifaceArray.push_back(std::move(hypervisor)); + ifaceArray.emplace_back(std::move(hypervisor)); count = ifaceArray.size(); } }); diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp index 7bec47849f..5fe967827e 100644 --- a/redfish-core/lib/trigger.hpp +++ b/redfish-core/lib/trigger.hpp @@ -164,7 +164,7 @@ inline std::optional<nlohmann::json> getMetricReportDefinitions( report["@odata.id"] = crow::utility::urlFromPieces("redfish", "v1", "TelemetryService", "MetricReportDefinitions", reportId); - reports.push_back(std::move(report)); + reports.emplace_back(std::move(report)); } return {std::move(reports)}; diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp index 59b2b3b8b5..b6c0487dfc 100644 --- a/redfish-core/lib/update_service.hpp +++ b/redfish-core/lib/update_service.hpp @@ -908,7 +908,7 @@ inline void requestRoutesSoftwareInventoryCollection(App& app) member["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "UpdateService", "FirmwareInventory", swId); - members.push_back(std::move(member)); + members.emplace_back(std::move(member)); asyncResp->res.jsonValue["Members@odata.count"] = members.size(); } @@ -925,7 +925,7 @@ inline static void nlohmann::json& relatedItem = aResp->res.jsonValue["RelatedItem"]; nlohmann::json::object_t item; item["@odata.id"] = "/redfish/v1/Managers/bmc"; - relatedItem.push_back(std::move(item)); + relatedItem.emplace_back(std::move(item)); aResp->res.jsonValue["RelatedItem@odata.count"] = relatedItem.size(); } else if (purpose == sw_util::biosPurpose) @@ -933,7 +933,7 @@ inline static void nlohmann::json& relatedItem = aResp->res.jsonValue["RelatedItem"]; nlohmann::json::object_t item; item["@odata.id"] = "/redfish/v1/Systems/system/Bios"; - relatedItem.push_back(std::move(item)); + relatedItem.emplace_back(std::move(item)); aResp->res.jsonValue["RelatedItem@odata.count"] = relatedItem.size(); } else |