mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 19:36:40 +00:00
Code Issues Releases Wiki Activity

Remove unneeded std::move

Browse source 
[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.
This commit is contained in:
fredzio 2021-08-01 13:05:40 +02:00
parent 36e33b0cf2
commit 9ba459662d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/opencs/model/world/commands.cpp
View file

@ -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()

3
apps/opencs/model/world/refidcollection.cpp
View file

@ -805,8 +805,7 @@ void CSMWorld::RefIdCollection::cloneRecord(const std::string& origin,
const std::string& destination,
const CSMWorld::UniversalId::Type type)
{
std::unique_ptr<RecordBase> newRecord =
std::move(mData.getRecord(mData.searchId(origin)).modifiedCopy());
std::unique_ptr<RecordBase> newRecord = mData.getRecord(mData.searchId(origin)).modifiedCopy();
mAdapters.find(type)->second->setId(*newRecord, destination);
mData.insertRecord(std::move(newRecord), type, destination);
}