From 9ba459662d509a070d0ca5fa1073b339be44e9bb Mon Sep 17 00:00:00 2001 From: fredzio Date: Sun, 1 Aug 2021 13:05:40 +0200 Subject: [PATCH] Remove unneeded std::move [19/199] Building CXX object apps/opencs/CMakeFiles/openmw-cs.dir/model/world/commands.cpp.o ../../../apps/opencs/model/world/commands.cpp:298:12: warning: moving a temporary object prevents copy elision [-Wpessimizing-move] mOld = std::move(model.getRecord (id).clone()); ^ ../../../apps/opencs/model/world/commands.cpp:298:12: note: remove std::move call here mOld = std::move(model.getRecord (id).clone()); ^~~~~~~~~~ ~ ../../../apps/opencs/model/world/commands.cpp:333:12: warning: moving a temporary object prevents copy elision [-Wpessimizing-move] mOld = std::move(model.getRecord (id).clone()); ^ ../../../apps/opencs/model/world/commands.cpp:333:12: note: remove std::move call here mOld = std::move(model.getRecord (id).clone()); ^~~~~~~~~~ ~ 2 warnings generated. --- apps/opencs/model/world/commands.cpp | 4 ++-- apps/opencs/model/world/refidcollection.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp index e69600eff4..7c5bafb52f 100644 --- a/apps/opencs/model/world/commands.cpp +++ b/apps/opencs/model/world/commands.cpp @@ -295,7 +295,7 @@ CSMWorld::RevertCommand::RevertCommand (IdTable& model, const std::string& id, Q { setText (("Revert record " + id).c_str()); - mOld = std::move(model.getRecord (id).clone()); + mOld = model.getRecord (id).clone(); } CSMWorld::RevertCommand::~RevertCommand() @@ -330,7 +330,7 @@ CSMWorld::DeleteCommand::DeleteCommand (IdTable& model, { setText (("Delete record " + id).c_str()); - mOld = std::move(model.getRecord (id).clone()); + mOld = model.getRecord (id).clone(); } CSMWorld::DeleteCommand::~DeleteCommand() diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp index 7f3e71106c..03337106ae 100644 --- a/apps/opencs/model/world/refidcollection.cpp +++ b/apps/opencs/model/world/refidcollection.cpp @@ -805,8 +805,7 @@ void CSMWorld::RefIdCollection::cloneRecord(const std::string& origin, const std::string& destination, const CSMWorld::UniversalId::Type type) { - std::unique_ptr newRecord = - std::move(mData.getRecord(mData.searchId(origin)).modifiedCopy()); + std::unique_ptr newRecord = mData.getRecord(mData.searchId(origin)).modifiedCopy(); mAdapters.find(type)->second->setId(*newRecord, destination); mData.insertRecord(std::move(newRecord), type, destination); }