mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-21 09:39:56 +00:00
Code Issues Projects Releases Wiki Activity

Add move assignment operator and move constructor for the ESM::Variant

Browse Source
This commit is contained in:
Andrei Kortunov 2021-03-13 22:28:13 +04:00
parent 4db2f79a3c
commit 4d48c81998
2 changed files with 23 additions and 0 deletions
Show Stats 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;
}
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)
: 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
{
return mType;

2
components/esm/variant.hpp
View File

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