Changeset 10379 for code/branches

Timestamp:

Apr 22, 2015, 10:29:21 PM (10 years ago)

Author:

landauf

Message:

check if all classes are registered

Location:

code/branches/core7/src/libraries/core

Files:

• CoreIncludes.h (modified) (3 diffs)
• class/Identifier.cc (modified) (1 diff)
• class/Identifier.h (modified) (2 diffs)

code/branches/core7/src/libraries/core/CoreIncludes.h

@@ -80 +80 @@
 #include "CorePrereqs.h"
 
+#include "util/OrxAssert.h"
 #include "util/Output.h"
 #include "class/IdentifierManager.h"
@@ -137 +138 @@
         return; \
     else \
+        OrxVerify(ClassIdentifier<ClassName>::getIdentifier()->isRegistered(), "Assertion failed in ClassIdentifier of type " << typeid(ClassName).name()); \
         ((void)0)
 
@@ -171 +173 @@
         identifier->setFactory(factory);
         identifier->setLoadable(bLoadable);
+        identifier->setRegistered(true);
         return identifier;
     }

code/branches/core7/src/libraries/core/class/Identifier.cc

@@ -55 +55 @@
         this->factory_ = 0;
         this->bInitialized_ = false;
+        this->bRegistered_ = false;
         this->bLoadable_ = false;
         this->bIsVirtualBase_ = false;

code/branches/core7/src/libraries/core/class/Identifier.h

@@ -133 +133 @@
 
             Identifiable* fabricate(Context* context);
+
+            inline bool isRegistered() const { return this->bRegistered_; }
+            inline void setRegistered(bool bRegistered) { this->bRegistered_ = bRegistered; }
 
             /// Returns true if the class can be loaded through XML.
@@ -225 +228 @@
 
             bool bInitialized_;                                            //!< Is true if the Identifier was completely initialized
+            bool bRegistered_;
             bool bLoadable_;                                               //!< False = it's not permitted to load the object through XML
             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.