Replace InstanceCounter with CountedObject

This commit is contained in:
Vinnie Falco
2013-06-17 17:45:33 -07:00
parent abce930b8b
commit 2abec05b5b
53 changed files with 321 additions and 334 deletions

View File

@@ -6,9 +6,6 @@
SETUP_LOG (STObject)
DECLARE_INSTANCE (SerializedObject);
DECLARE_INSTANCE (SerializedArray);
UPTR_T<SerializedType> STObject::makeDefaultObject (SerializedTypeID id, SField::ref name)
{
assert ((id == STI_NOTPRESENT) || (id == name.fieldType));

View File

@@ -7,10 +7,9 @@
#ifndef RIPPLE_SERIALIZEDOBJECT_H
#define RIPPLE_SERIALIZEDOBJECT_H
DEFINE_INSTANCE (SerializedObject);
DEFINE_INSTANCE (SerializedArray);
class STObject : public SerializedType, private IS_INSTANCE (SerializedObject)
class STObject
: public SerializedType
, public CountedObject <STObject>
{
public:
STObject () : mType (NULL)
@@ -298,7 +297,9 @@ template<> struct range_const_iterator<STObject>
//------------------------------------------------------------------------------
class STArray : public SerializedType, private IS_INSTANCE (SerializedArray)
class STArray
: public SerializedType
, public CountedObject <STArray>
{
public:
typedef boost::ptr_vector<STObject> vector;