Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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

removed check from r10379 again

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

Legend:

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

    r10379 r10381  
    8080#include "CorePrereqs.h"
    8181
    82 #include "util/OrxAssert.h"
    8382#include "util/Output.h"
    8483#include "class/IdentifierManager.h"
     
    138137        return; \
    139138    else \
    140         OrxVerify(ClassIdentifier<ClassName>::getIdentifier()->isRegistered(), "Assertion failed in ClassIdentifier of type " << typeid(ClassName).name()); \
    141139        ((void)0)
    142140
     
    173171        identifier->setFactory(factory);
    174172        identifier->setLoadable(bLoadable);
    175         identifier->setRegistered(true);
    176173        return identifier;
    177174    }
  • code/branches/core7/src/libraries/core/class/Identifier.cc

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

    r10379 r10381  
    133133
    134134            Identifiable* fabricate(Context* context);
    135 
    136             inline bool isRegistered() const { return this->bRegistered_; }
    137             inline void setRegistered(bool bRegistered) { this->bRegistered_ = bRegistered; }
    138135
    139136            /// Returns true if the class can be loaded through XML.
     
    228225
    229226            bool bInitialized_;                                            //!< Is true if the Identifier was completely initialized
    230             bool bRegistered_;
    231227            bool bLoadable_;                                               //!< False = it's not permitted to load the object through XML
    232228            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.