Cleanups.

This commit is contained in:
JoelKatz
2012-09-26 15:09:27 -07:00
parent d76f61a648
commit ad4952b958
2 changed files with 4 additions and 6 deletions

View File

@@ -169,10 +169,8 @@ bool STObject::isFieldAllowed(SField::ref field)
return false;
}
bool STObject::set(SOElement::ptrList elem, SerializerIterator& sit, int depth)
bool STObject::set(SerializerIterator& sit, int depth)
{ // return true = terminated with end-of-object
setType(elem);
mData.empty();
while (!sit.empty())
{

View File

@@ -39,19 +39,19 @@ public:
{ set(type); }
STObject(SOElement::ptrList type, SerializerIterator& sit, SField::ref name) : SerializedType(name)
{ set(type, sit); }
{ set(sit); setType(type); }
virtual ~STObject() { ; }
static std::auto_ptr<SerializedType> deserialize(SerializerIterator& sit, SField::ref name)
{ return std::auto_ptr<SerializedType>(construct(sit, name)); }
void setType(SOElement const * t);
void setType(SOElement::ptrList);
bool isValidForType();
bool isFieldAllowed(SField::ref);
void set(SOElement::ptrList);
bool set(SOElement::ptrList, SerializerIterator& u, int depth = 0);
bool set(SerializerIterator& u, int depth = 0);
virtual SerializedTypeID getSType() const { return STI_OBJECT; }
virtual bool isEquivalent(const SerializedType& t) const;