Changeset 10483 for code/branches/core7

Timestamp:

May 25, 2015, 10:36:28 PM (10 years ago)

Author:

landauf

Message:

avoid dependency on IdentifierManager for as long as possible

Location:

code/branches/core7/src/libraries/core

Files:

• Core.cc (modified) (1 diff)
• class/Identifier.cc (modified) (1 diff)
• class/Identifier.h (modified) (1 diff)
• class/IdentifierManager.cc (modified) (1 diff)
• class/IdentifierManager.h (modified) (2 diffs)

code/branches/core7/src/libraries/core/Core.cc

@@ -135 +135 @@
         }
 
+        // TODO: initialize Root-Context
+        // TODO: initialize IdentifierManager here
         // TODO: initialize ScopeManager here
         // TODO: initialize CommandLineParser here

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

@@ -53 +53 @@
     */
     Identifier::Identifier(const std::string& name, Factory* factory, bool bLoadable)
-        : classID_(IdentifierManager::getInstance().getUniqueClassId())
     {
         orxout(verbose, context::identifier) << "Create identifier for " << name << endl;
 
+        static unsigned int classIDCounter = 0;
+
+        this->classID_ = classIDCounter++;
         this->name_ = name;
         this->factory_ = factory;

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

@@ -231 +231 @@
             Factory* factory_;                                             //!< The Factory, able to create new objects of the given class (if available)
             uint32_t networkID_;                                           //!< The network ID to identify a class through the network
-            const unsigned int classID_;                                   //!< Uniquely identifies a class (might not be the same as the networkID_)
+            unsigned int classID_;                                         //!< Uniquely identifies a class (might not be the same as the networkID_)
 
             bool bHasConfigValues_;                                        //!< True if this class has at least one assigned config value

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

@@ -53 +53 @@
     {
         this->hierarchyCreatingCounter_s = 0;
-        this->classIDCounter_s = 0;
         this->recordTraceForIdentifier_ = NULL;
     }

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

@@ -51 +51 @@
             void addIdentifier(Identifier* identifier);
             void removeIdentifier(Identifier* identifier);
-
-            unsigned int getUniqueClassId()
-                { return this->classIDCounter_s++; }
 
 
@@ -110 +107 @@
 
             int hierarchyCreatingCounter_s;                         //!< Bigger than zero if at least one Identifier stores its parents (its an int instead of a bool to avoid conflicts with multithreading)
-            unsigned int classIDCounter_s;                          //!< counter for the unique classIDs
 
             /// Used while creating the object hierarchy to keep track of the identifiers of a newly created object (and all other objects that get created as