From a5720c951e81e78097b9b00aeb1aac2c3b4366a6 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Sun, 17 Mar 2024 15:12:52 -0400 Subject: [PATCH] use emplace_back / emplace where possible (#3814) these were pointed out by clang-tidy --- Src/Base/AMReX_BLBackTrace.cpp | 2 +- Src/Base/AMReX_FabArrayBase.cpp | 9 +++------ Src/Base/AMReX_MPMD.cpp | 6 ++---- Src/Base/AMReX_ParmParse.cpp | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Src/Base/AMReX_BLBackTrace.cpp b/Src/Base/AMReX_BLBackTrace.cpp index 4a4d527dbb1..ce0a78bcff5 100644 --- a/Src/Base/AMReX_BLBackTrace.cpp +++ b/Src/Base/AMReX_BLBackTrace.cpp @@ -371,7 +371,7 @@ BLBTer::BLBTer(const std::string& s, const char* file, int line) std::ostringstream ss0; ss0 << "Proc. " << ParallelDescriptor::MyProc() << ": \"" << s << "\""; - BLBackTrace::bt_stack.push(std::make_pair(ss0.str(), line_file)); + BLBackTrace::bt_stack.emplace(ss0.str(), line_file); #endif } diff --git a/Src/Base/AMReX_FabArrayBase.cpp b/Src/Base/AMReX_FabArrayBase.cpp index 6997f3489dd..eb8fc99605b 100644 --- a/Src/Base/AMReX_FabArrayBase.cpp +++ b/Src/Base/AMReX_FabArrayBase.cpp @@ -1325,8 +1325,7 @@ FabArrayBase::RB90::define (const FabArrayBase& fa) { Box bxsnd = (n==0) ? amrex::get<0>(dst_to_src)(bxrcv) : amrex::get<1>(dst_to_src)(bxrcv); - send_tags[dst_owner].push_back(FabArrayBase::CopyComTag(bxrcv, bxsnd, - krcv, ksnd)); + send_tags[dst_owner].emplace_back(bxrcv, bxsnd, krcv, ksnd); } } } @@ -1498,8 +1497,7 @@ FabArrayBase::RB180::define (const FabArrayBase& fa) if (dst_owner != myproc) // local copy will be dealt with later { Box const& bxsnd = convert(bxrcv); - send_tags[dst_owner].push_back(FabArrayBase::CopyComTag(bxrcv, bxsnd, - krcv, ksnd)); + send_tags[dst_owner].emplace_back(bxrcv, bxsnd, krcv, ksnd); } } } @@ -1683,8 +1681,7 @@ FabArrayBase::PolarB::define (const FabArrayBase& fa) if (dst_owner != myproc) // local copy will be dealt with later { Box const bxsnd = (n<4) ? convert(bxrcv) : convert_corner(bxrcv); - send_tags[dst_owner].push_back(FabArrayBase::CopyComTag(bxrcv, bxsnd, - krcv, ksnd)); + send_tags[dst_owner].emplace_back(bxrcv, bxsnd, krcv, ksnd); } } } diff --git a/Src/Base/AMReX_MPMD.cpp b/Src/Base/AMReX_MPMD.cpp index f0555a8d1a0..eff9109553d 100644 --- a/Src/Base/AMReX_MPMD.cpp +++ b/Src/Base/AMReX_MPMD.cpp @@ -229,10 +229,8 @@ Copier::Copier (BoxArray const& ba, DistributionMapping const& dm) const int oi = isec.first; const Box& bx = isec.second; const int orank = oprocs[oi]; - m_SndTags[orank].push_back - (FabArrayBase::CopyComTag(bx, bx, oi, i)); - m_RcvTags[orank].push_back - (FabArrayBase::CopyComTag(bx, bx, i, oi)); + m_SndTags[orank].emplace_back(bx, bx, oi, i); + m_RcvTags[orank].emplace_back(bx, bx, i, oi); } } } diff --git a/Src/Base/AMReX_ParmParse.cpp b/Src/Base/AMReX_ParmParse.cpp index 6fe442bfc5b..78a149fb55c 100644 --- a/Src/Base/AMReX_ParmParse.cpp +++ b/Src/Base/AMReX_ParmParse.cpp @@ -1130,7 +1130,7 @@ ParmParse::ParmParse (const std::string& prefix) ParmParse::ParmParse (Table& a_table) : m_table(a_table) { - m_pstack.push(""); + m_pstack.emplace(""); } ParmParse::Frame::Frame (ParmParse& pp, const std::string& pfix)