summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2023-05-12 18:10:08 +0300
committerPatrick Williams <patrick@stwcx.xyz>2023-05-12 19:07:07 +0300
commitad539545b8638d934f917e4d711fa7ef48011326 (patch)
tree8ab6181da11fd7a44c7a6a23bbdb6d6256224ce7
parent65a176cdc66922b7d586e088c7ecf0602950ddcf (diff)
downloadbmcweb-ad539545b8638d934f917e4d711fa7ef48011326.tar.xz
use emplace where appropriate per clang-tidy
The clang-tidy warning 'modernize-use-emplace' correctly flags a few places where emplace should be used over push. Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I6ca79285a87d6927e718345dc8dce0387e6b1eda
-rw-r--r--include/ibm/locks.hpp3
-rw-r--r--include/ibm/management_console_rest.hpp4
-rw-r--r--redfish-core/include/server_sent_events.hpp2
-rw-r--r--redfish-core/lib/aggregation_service.hpp2
-rw-r--r--redfish-core/lib/certificate_service.hpp2
-rw-r--r--redfish-core/lib/chassis.hpp8
-rw-r--r--redfish-core/lib/hypervisor_system.hpp6
-rw-r--r--redfish-core/lib/managers.hpp10
-rw-r--r--redfish-core/lib/message_registries.hpp2
-rw-r--r--redfish-core/lib/redfish_v1.hpp2
-rw-r--r--redfish-core/lib/trigger.hpp2
-rw-r--r--redfish-core/src/error_messages.cpp4
-rw-r--r--test/redfish-core/lib/chassis_test.cpp4
13 files changed, 25 insertions, 26 deletions
diff --git a/include/ibm/locks.hpp b/include/ibm/locks.hpp
index 99b9cc3fba..f0e1612588 100644
--- a/include/ibm/locks.hpp
+++ b/include/ibm/locks.hpp
@@ -434,8 +434,7 @@ inline Rc Lock::isConflictWithTable(const LockRequests& refLockRequestStructure)
// Lock table is empty, so we are safe to add the lockrecords
// as there will be no conflict
BMCWEB_LOG_DEBUG << "Lock table is empty, so adding the lockrecords";
- lockTable.emplace(std::pair<uint32_t, LockRequests>(
- thisTransactionId, refLockRequestStructure));
+ lockTable.emplace(thisTransactionId, refLockRequestStructure);
return std::make_pair(false, thisTransactionId);
}
diff --git a/include/ibm/management_console_rest.hpp b/include/ibm/management_console_rest.hpp
index 51f5298b38..c2bf14af0c 100644
--- a/include/ibm/management_console_rest.hpp
+++ b/include/ibm/management_console_rest.hpp
@@ -450,10 +450,10 @@ inline void
BMCWEB_LOG_DEBUG << "Lockflag : " << lockFlags;
BMCWEB_LOG_DEBUG << "SegmentLength : " << segmentLength;
- segInfo.push_back(std::make_pair(lockFlags, segmentLength));
+ segInfo.emplace_back(std::make_pair(lockFlags, segmentLength));
}
- lockRequestStructure.push_back(make_tuple(
+ lockRequestStructure.emplace_back(make_tuple(
req.session->uniqueId, req.session->clientId.value_or(""), lockType,
resourceId, segInfo));
}
diff --git a/redfish-core/include/server_sent_events.hpp b/redfish-core/include/server_sent_events.hpp
index fcc6531d96..1592d507a1 100644
--- a/redfish-core/include/server_sent_events.hpp
+++ b/redfish-core/include/server_sent_events.hpp
@@ -280,7 +280,7 @@ class ServerSentEvents : public std::enable_shared_from_this<ServerSentEvents>
if (requestDataQueue.size() <= maxReqQueueSize)
{
- requestDataQueue.push(std::pair(id, data));
+ requestDataQueue.emplace(id, data);
checkQueue(true);
}
else
diff --git a/redfish-core/lib/aggregation_service.hpp b/redfish-core/lib/aggregation_service.hpp
index 1cd2e68d9d..83953fd080 100644
--- a/redfish-core/lib/aggregation_service.hpp
+++ b/redfish-core/lib/aggregation_service.hpp
@@ -81,7 +81,7 @@ inline void populateAggregationSourceCollection(
member["@odata.id"] =
crow::utility::urlFromPieces("redfish", "v1", "AggregationService",
"AggregationSources", sat.first);
- members.push_back(std::move(member));
+ members.emplace_back(std::move(member));
}
asyncResp->res.jsonValue["Members@odata.count"] = members.size();
asyncResp->res.jsonValue["Members"] = std::move(members);
diff --git a/redfish-core/lib/certificate_service.hpp b/redfish-core/lib/certificate_service.hpp
index dcbff2d7cd..4e030d2297 100644
--- a/redfish-core/lib/certificate_service.hpp
+++ b/redfish-core/lib/certificate_service.hpp
@@ -427,7 +427,7 @@ inline void handleCertificateServiceGet(
replace["target"] =
"/redfish/v1/CertificateService/Actions/CertificateService.ReplaceCertificate";
nlohmann::json::array_t allowed;
- allowed.push_back("PEM");
+ allowed.emplace_back("PEM");
replace["CertificateType@Redfish.AllowableValues"] = std::move(allowed);
actions["#CertificateService.GenerateCSR"]["target"] =
"/redfish/v1/CertificateService/Actions/CertificateService.GenerateCSR";
diff --git a/redfish-core/lib/chassis.hpp b/redfish-core/lib/chassis.hpp
index c64d27c335..dc6afd8754 100644
--- a/redfish-core/lib/chassis.hpp
+++ b/redfish-core/lib/chassis.hpp
@@ -453,14 +453,14 @@ inline void
nlohmann::json::array_t computerSystems;
nlohmann::json::object_t system;
system["@odata.id"] = "/redfish/v1/Systems/system";
- computerSystems.push_back(std::move(system));
+ computerSystems.emplace_back(std::move(system));
asyncResp->res.jsonValue["Links"]["ComputerSystems"] =
std::move(computerSystems);
nlohmann::json::array_t managedBy;
nlohmann::json::object_t manager;
manager["@odata.id"] = "/redfish/v1/Managers/bmc";
- managedBy.push_back(std::move(manager));
+ managedBy.emplace_back(std::move(manager));
asyncResp->res.jsonValue["Links"]["ManagedBy"] =
std::move(managedBy);
getChassisState(asyncResp);
@@ -748,9 +748,9 @@ inline void handleChassisResetActionInfoGet(
parameter["Required"] = true;
parameter["DataType"] = "String";
nlohmann::json::array_t allowed;
- allowed.push_back("PowerCycle");
+ allowed.emplace_back("PowerCycle");
parameter["AllowableValues"] = std::move(allowed);
- parameters.push_back(std::move(parameter));
+ parameters.emplace_back(std::move(parameter));
asyncResp->res.jsonValue["Parameters"] = std::move(parameters);
}
diff --git a/redfish-core/lib/hypervisor_system.hpp b/redfish-core/lib/hypervisor_system.hpp
index e524145ed8..ec59140c7f 100644
--- a/redfish-core/lib/hypervisor_system.hpp
+++ b/redfish-core/lib/hypervisor_system.hpp
@@ -825,7 +825,7 @@ inline void handleHypervisorSystemGet(
nlohmann::json::array_t managedBy;
nlohmann::json::object_t manager;
manager["@odata.id"] = "/redfish/v1/Managers/bmc";
- managedBy.push_back(std::move(manager));
+ managedBy.emplace_back(std::move(manager));
asyncResp->res.jsonValue["Links"]["ManagedBy"] = std::move(managedBy);
asyncResp->res.jsonValue["EthernetInterfaces"]["@odata.id"] =
"/redfish/v1/Systems/hypervisor/EthernetInterfaces";
@@ -998,9 +998,9 @@ inline void handleHypervisorResetActionGet(
parameter["Required"] = true;
parameter["DataType"] = "String";
nlohmann::json::array_t allowed;
- allowed.push_back("On");
+ allowed.emplace_back("On");
parameter["AllowableValues"] = std::move(allowed);
- parameters.push_back(std::move(parameter));
+ parameters.emplace_back(std::move(parameter));
asyncResp->res.jsonValue["Parameters"] = std::move(parameters);
});
}
diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index 134ecb65d8..1319eca53e 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -259,12 +259,12 @@ inline void requestRoutesManagerResetActionInfo(App& app)
parameter["DataType"] = "String";
nlohmann::json::array_t allowableValues;
- allowableValues.push_back("GracefulRestart");
- allowableValues.push_back("ForceRestart");
+ allowableValues.emplace_back("GracefulRestart");
+ allowableValues.emplace_back("ForceRestart");
parameter["AllowableValues"] = std::move(allowableValues);
nlohmann::json::array_t parameters;
- parameters.push_back(std::move(parameter));
+ parameters.emplace_back(std::move(parameter));
asyncResp->res.jsonValue["Parameters"] = std::move(parameters);
});
@@ -1992,7 +1992,7 @@ inline void requestRoutesManager(App& app)
nlohmann::json::array_t managerForServers;
nlohmann::json::object_t manager;
manager["@odata.id"] = "/redfish/v1/Systems/system";
- managerForServers.push_back(std::move(manager));
+ managerForServers.emplace_back(std::move(manager));
asyncResp->res.jsonValue["Links"]["ManagerForServers"] =
std::move(managerForServers);
@@ -2026,7 +2026,7 @@ inline void requestRoutesManager(App& app)
boost::urls::url chassiUrl = crow::utility::urlFromPieces(
"redfish", "v1", "Chassis", chassisId);
managerObj["@odata.id"] = chassiUrl;
- managerForChassis.push_back(std::move(managerObj));
+ managerForChassis.emplace_back(std::move(managerObj));
aRsp->res.jsonValue["Links"]["ManagerForChassis"] =
std::move(managerForChassis);
aRsp->res.jsonValue["Links"]["ManagerInChassis"]["@odata.id"] =
diff --git a/redfish-core/lib/message_registries.hpp b/redfish-core/lib/message_registries.hpp
index 907f6cf93d..ce147a8f6f 100644
--- a/redfish-core/lib/message_registries.hpp
+++ b/redfish-core/lib/message_registries.hpp
@@ -120,7 +120,7 @@ inline void handleMessageRoutesMessageRegistryFileGet(
asyncResp->res.jsonValue["Id"] = header->registryPrefix;
asyncResp->res.jsonValue["Registry"] = header->id;
nlohmann::json::array_t languages;
- languages.push_back("en");
+ languages.emplace_back("en");
asyncResp->res.jsonValue["Languages@odata.count"] = languages.size();
asyncResp->res.jsonValue["Languages"] = std::move(languages);
nlohmann::json::array_t locationMembers;
diff --git a/redfish-core/lib/redfish_v1.hpp b/redfish-core/lib/redfish_v1.hpp
index a9b81e423b..b3174fbb1d 100644
--- a/redfish-core/lib/redfish_v1.hpp
+++ b/redfish-core/lib/redfish_v1.hpp
@@ -88,7 +88,7 @@ inline void
nlohmann::json::object_t member;
member["@odata.id"] = crow::utility::urlFromPieces(
"redfish", "v1", "JsonSchemas", schema);
- members.push_back(std::move(member));
+ members.emplace_back(std::move(member));
}
json["Members"] = std::move(members);
json["Members@odata.count"] = schemas.size();
diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp
index cb2707543a..7bec47849f 100644
--- a/redfish-core/lib/trigger.hpp
+++ b/redfish-core/lib/trigger.hpp
@@ -107,7 +107,7 @@ inline std::optional<nlohmann::json::array_t>
trigger["Severity"] = severity;
trigger["DwellTime"] = *duration;
trigger["Value"] = value;
- triggers.push_back(std::move(trigger));
+ triggers.emplace_back(std::move(trigger));
}
return {std::move(triggers)};
diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp
index b4358295c9..5f802462ef 100644
--- a/redfish-core/src/error_messages.cpp
+++ b/redfish-core/src/error_messages.cpp
@@ -1796,8 +1796,8 @@ nlohmann::json invalidUpload(std::string_view arg1, std::string_view arg2)
ret["MessageId"] = "OpenBMC.0.2.InvalidUpload";
ret["Message"] = std::move(msg);
nlohmann::json::array_t args;
- args.push_back(arg1);
- args.push_back(arg2);
+ args.emplace_back(arg1);
+ args.emplace_back(arg2);
ret["MessageArgs"] = std::move(args);
ret["MessageSeverity"] = "Warning";
ret["Resolution"] = "None.";
diff --git a/test/redfish-core/lib/chassis_test.cpp b/test/redfish-core/lib/chassis_test.cpp
index 8f181632ba..45d06ae8aa 100644
--- a/test/redfish-core/lib/chassis_test.cpp
+++ b/test/redfish-core/lib/chassis_test.cpp
@@ -33,9 +33,9 @@ void assertChassisResetActionInfoGet(const std::string& chassisId,
parameter["Required"] = true;
parameter["DataType"] = "String";
nlohmann::json::array_t allowed;
- allowed.push_back("PowerCycle");
+ allowed.emplace_back("PowerCycle");
parameter["AllowableValues"] = std::move(allowed);
- parameters.push_back(std::move(parameter));
+ parameters.emplace_back(std::move(parameter));
EXPECT_EQ(res.jsonValue["Parameters"], parameters);
}