From 00496a504a13fbb63ccac413426cf17d47a84a1c Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sun, 3 Mar 2019 14:10:00 +0100
Subject: [PATCH] Use emplace_back for some of vector.push_back ops.
clang-tidy modernize-use-emplace check.
---
.../DataExplorer/DataView/DirectConditionGenerator.cpp | 3 +--
MeshLib/IO/VtkIO/PVDFile.cpp | 2 +-
.../HeatTransportBHE/CreateHeatTransportBHEProcess.cpp | 8 +++++---
ProcessLib/LIE/Common/MeshUtils.cpp | 5 ++---
ProcessLib/Utils/ProcessUtils.cpp | 2 +-
Tests/MaterialLib/TestMPLParseMaterial.cpp | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
index c80d8b25664..022effb4bc3 100644
--- a/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
+++ b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
@@ -53,8 +53,7 @@ DirectConditionGenerator::directToSurfaceNodes(const MeshLib::Mesh& mesh,
{
double val(raster->getValueAtPoint(*surface_node));
val = (val == no_data) ? 0 : val;
- _direct_values.push_back(
- std::make_pair(surface_node->getID(), val));
+ _direct_values.emplace_back(surface_node->getID(), val);
}
delete raster;
diff --git a/MeshLib/IO/VtkIO/PVDFile.cpp b/MeshLib/IO/VtkIO/PVDFile.cpp
index 897b157fb39..5725955779c 100644
--- a/MeshLib/IO/VtkIO/PVDFile.cpp
+++ b/MeshLib/IO/VtkIO/PVDFile.cpp
@@ -22,7 +22,7 @@ namespace IO
void PVDFile::addVTUFile(const std::string &vtu_fname, double timestep)
{
- _datasets.push_back(std::make_pair(timestep, vtu_fname));
+ _datasets.emplace_back(timestep, vtu_fname);
std::ofstream fh(_pvd_filename.c_str());
if (!fh) {
diff --git a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
index fb8b8a1913d..2028bcbe9dc 100644
--- a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
+++ b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
@@ -184,19 +184,21 @@ std::unique_ptr<Process> createHeatTransportBHEProcess(
if (bhe_type == "1U")
{
- bhes.push_back(BHE::createBHE1U(bhe_config, curves));
+ bhes.emplace_back(BHE::createBHE1U(bhe_config, curves));
continue;
}
if (bhe_type == "CXA")
{
- bhes.push_back(BHE::createBHECoaxial<BHE::BHE_CXA>(bhe_config, curves));
+ bhes.emplace_back(
+ BHE::createBHECoaxial<BHE::BHE_CXA>(bhe_config, curves));
continue;
}
if (bhe_type == "CXC")
{
- bhes.push_back(BHE::createBHECoaxial<BHE::BHE_CXC>(bhe_config, curves));
+ bhes.emplace_back(
+ BHE::createBHECoaxial<BHE::BHE_CXC>(bhe_config, curves));
continue;
}
OGS_FATAL("Unknown BHE type '%s'.", bhe_type.c_str());
diff --git a/ProcessLib/LIE/Common/MeshUtils.cpp b/ProcessLib/LIE/Common/MeshUtils.cpp
index b66276a059a..73b391801af 100644
--- a/ProcessLib/LIE/Common/MeshUtils.cpp
+++ b/ProcessLib/LIE/Common/MeshUtils.cpp
@@ -186,7 +186,7 @@ void findFracutreIntersections(
matIDs[1] = matid; // slave
}
}
- vec_branch_nodeID_matIDs.push_back(std::make_pair(nodeID, matIDs));
+ vec_branch_nodeID_matIDs.emplace_back(nodeID, matIDs);
}
else
{
@@ -195,8 +195,7 @@ void findFracutreIntersections(
vec_matID_counts.rbegin()->first);
matIDs[1] = std::max(vec_matID_counts.begin()->first,
vec_matID_counts.rbegin()->first);
- vec_junction_nodeID_matIDs.push_back(
- std::make_pair(nodeID, matIDs));
+ vec_junction_nodeID_matIDs.emplace_back(nodeID, matIDs);
}
}
diff --git a/ProcessLib/Utils/ProcessUtils.cpp b/ProcessLib/Utils/ProcessUtils.cpp
index 4e1a78210b1..d9d24766da4 100644
--- a/ProcessLib/Utils/ProcessUtils.cpp
+++ b/ProcessLib/Utils/ProcessUtils.cpp
@@ -90,7 +90,7 @@ std::vector<std::reference_wrapper<ProcessVariable>> findProcessVariables(
for (std::string const& var_name : var_names)
{
- vars.push_back(findVariableByName(variables, var_name, tag));
+ vars.emplace_back(findVariableByName(variables, var_name, tag));
cached_var_names.push_back(var_name);
}
diff --git a/Tests/MaterialLib/TestMPLParseMaterial.cpp b/Tests/MaterialLib/TestMPLParseMaterial.cpp
index 91c5b74c11f..8f2782bd777 100644
--- a/Tests/MaterialLib/TestMPLParseMaterial.cpp
+++ b/Tests/MaterialLib/TestMPLParseMaterial.cpp
@@ -52,7 +52,7 @@ struct Medium
{
for (auto p : phases_)
{
- phases.push_back(Phase(p));
+ phases.emplace_back(p);
}
}
};
--
GitLab