eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve move constructor

This commit is contained in:
Vasilii Rogin 2023-05-15 23:03:36 +03:00
parent d084b720f9
commit b21b1416ab
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/sfall_arrays.cc
View File

@ -102,26 +102,12 @@ public:
ArrayElement(const ArrayElement& other) = delete;
ArrayElement& operator=(const ArrayElement& rhs) = delete;
ArrayElement(ArrayElement&& other)
: type(ArrayElementType::INT)
, value(
{ integerValue : 0 })
{
// Maybe this can be done simpler way?
type = other.type;
switch (type) {
case ArrayElementType::INT:
value.integerValue = other.value.integerValue;
break;
case ArrayElementType::FLOAT:
value.floatValue = other.value.floatValue;
break;
case ArrayElementType::POINTER:
value.pointerValue = other.value.pointerValue;
break;
case ArrayElementType::STRING:
value.stringValue = other.value.stringValue;
other.value.stringValue = nullptr;
break;
default:
throw(std::exception());
}
std::swap(type, other.type);
std::swap(value, other.value);
};
ArrayElement& operator=(ArrayElement&& other)
{