Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10379


Ignore:
Timestamp:
Apr 22, 2015, 10:29:21 PM (9 years ago)
Author:
landauf
Message:

check if all classes are registered

Location:
code/branches/core7/src/libraries/core
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core7/src/libraries/core/CoreIncludes.h

    r10374 r10379  
    8080#include "CorePrereqs.h"
    8181
     82#include "util/OrxAssert.h"
    8283#include "util/Output.h"
    8384#include "class/IdentifierManager.h"
     
    137138        return; \
    138139    else \
     140        OrxVerify(ClassIdentifier<ClassName>::getIdentifier()->isRegistered(), "Assertion failed in ClassIdentifier of type " << typeid(ClassName).name()); \
    139141        ((void)0)
    140142
     
    171173        identifier->setFactory(factory);
    172174        identifier->setLoadable(bLoadable);
     175        identifier->setRegistered(true);
    173176        return identifier;
    174177    }
  • code/branches/core7/src/libraries/core/class/Identifier.cc

    r10377 r10379  
    5555        this->factory_ = 0;
    5656        this->bInitialized_ = false;
     57        this->bRegistered_ = false;
    5758        this->bLoadable_ = false;
    5859        this->bIsVirtualBase_ = false;
  • code/branches/core7/src/libraries/core/class/Identifier.h

    r10377 r10379  
    133133
    134134            Identifiable* fabricate(Context* context);
     135
     136            inline bool isRegistered() const { return this->bRegistered_; }
     137            inline void setRegistered(bool bRegistered) { this->bRegistered_ = bRegistered; }
    135138
    136139            /// Returns true if the class can be loaded through XML.
     
    225228
    226229            bool bInitialized_;                                            //!< Is true if the Identifier was completely initialized
     230            bool bRegistered_;
    227231            bool bLoadable_;                                               //!< False = it's not permitted to load the object through XML
    228232            bool bIsVirtualBase_;                                          //!< If true, it is recommended to inherit virtually from this class. This changes the order of initialization of child classes, thus this information is necessary to check the class hierarchy.
Note: See TracChangeset for help on using the changeset viewer.