Changeset 10481 for code/branches/core7/src/libraries/core/CoreIncludes.h

Timestamp:

May 25, 2015, 9:40:11 PM (9 years ago)

Author:

landauf

Message:

StaticallyInitializedIdentifier is now responsible to register and unregister the assigned identifier.

File:

• code/branches/core7/src/libraries/core/CoreIncludes.h (modified) (3 diffs)

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

@@ -167 +167 @@
     inline Identifier* registerClass(const std::string& name, Factory* factory, bool bLoadable = true)
     {
-        Identifier* identifier = new ClassIdentifier<T>(name, factory, bLoadable);
-        IdentifierManager::getInstance().addIdentifier(identifier);
-        return identifier;
+        return new ClassIdentifier<T>(name, factory, bLoadable);
     }
 
@@ -242 +240 @@
             virtual void load()
             {
+                IdentifierManager::getInstance().addIdentifier(this->identifier_);
                 for (size_t i = 0; i < this->parents_.size(); ++i)
                     this->identifier_->inheritsFrom(this->parents_[i]->getParent());
@@ -248 +247 @@
             virtual void unload()
             {
+                IdentifierManager::getInstance().removeIdentifier(this->identifier_);
             }