Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-04 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #3053 from akortunov/master

Browse source 
Add move assignment operator for the ESM::Variant
This commit is contained in:
Bret Curtis 2021-03-14 22:12:23 +01:00 • committed by GitHub
commit 90baf8ad60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/esm/variant.cpp
View file

@ -62,10 +62,31 @@ ESM::Variant& ESM::Variant::operator= (const Variant& variant)
return *this; return *this;
} }
ESM::Variant& ESM::Variant::operator= (Variant&& variant)
{
if (&variant!=this)
{
delete mData;
mType = variant.mType;
mData = variant.mData;
variant.mData = nullptr;
}
return *this;
}
ESM::Variant::Variant (const Variant& variant) ESM::Variant::Variant (const Variant& variant)
: mType (variant.mType), mData (variant.mData ? variant.mData->clone() : nullptr) : mType (variant.mType), mData (variant.mData ? variant.mData->clone() : nullptr)
{} {}
ESM::Variant::Variant(Variant&& variant)
: mType (variant.mType), mData (variant.mData)
{
variant.mData = nullptr;
}
ESM::VarType ESM::Variant::getType() const ESM::VarType ESM::Variant::getType() const
{ {
return mType; return mType;

2
components/esm/variant.hpp
View file

@ -46,8 +46,10 @@ namespace ESM
~Variant(); ~Variant();
Variant& operator= (const Variant& variant); Variant& operator= (const Variant& variant);
Variant& operator= (Variant && variant);
Variant (const Variant& variant); Variant (const Variant& variant);
Variant (Variant&& variant);
VarType getType() const; VarType getType() const;