Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6692 from dumganhar/value-copy-or-move-contructor-fix 

Value: initialize Value with Type::None when its move and copy contructor is called.
This commit is contained in:
James Chen 2014-05-12 23:39:26 +08:00
parent 22b925e054 602d89126f
commit f2664d1c36
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cocos/base/CCValue.cpp
View File

@ -126,11 +126,13 @@ Value::Value(ValueMapIntKey&& v)
} }
Value::Value(const Value& other) Value::Value(const Value& other)
: _type(Type::NONE)
{ {
*this = other; *this = other;
} }
Value::Value(Value&& other) Value::Value(Value&& other)
: _type(Type::NONE)
{ {
*this = std::move(other); *this = std::move(other);
} }
@ -192,7 +194,6 @@ Value& Value::operator= (const Value& other)
default: default:
break; break;
} }
_type = other._type;
} }
return *this; return *this;
} }
@ -201,7 +202,7 @@ Value& Value::operator= (Value&& other)
{ {
if (this != &other) if (this != &other)
{ {
reset(other._type); clear();
switch (other._type) switch (other._type)
{ {
case Type::BYTE: case Type::BYTE:
@ -683,14 +684,6 @@ std::string Value::getDescription()
void Value::clear() void Value::clear()
{ {
reset(Type::NONE);
}
void Value::reset(Type type)
{
if (_type == type)
return;
// Free memory the old value allocated // Free memory the old value allocated
switch (_type) switch (_type)
{ {
@ -724,6 +717,16 @@ void Value::reset(Type type)
default: default:
break; break;
} }
_type = Type::NONE;
}
void Value::reset(Type type)
{
if (_type == type)
return;
clear();
// Allocate memory for the new value // Allocate memory for the new value
switch (type) switch (type)