ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

STArrays should only hold STObject's

Browse Source
This commit is contained in:
JoelKatz
2012-09-27 20:47:11 -07:00
parent f6a151b5a8
commit 2c2bfab52f
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/SerializedObject.cpp
View File

@@ -235,11 +235,7 @@ void STObject::add(Serializer& s) const
field->addFieldID(s);
field->add(s);
if (dynamic_cast<const STObject*>(field))
s.addFieldID(STI_OBJECT, 1);
else if (dynamic_cast<const STArray*>(field))
s.addFieldID(STI_ARRAY, 1);
s.addFieldID(STI_OBJECT, 1);
}
}
@@ -691,15 +687,11 @@ Json::Value STArray::getJson(int) const
void STArray::add(Serializer& s) const
{
BOOST_FOREACH(const SerializedType& object, value)
BOOST_FOREACH(const STObject& object, value)
{
object.addFieldID(s);
object.add(s);
if (dynamic_cast<const STObject*>(&object))
s.addFieldID(STI_OBJECT, 1);
else if (dynamic_cast<const STArray*>(&object))
s.addFieldID(STI_ARRAY, 1);
s.addFieldID(STI_OBJECT, 1);
}
}