Changeset 9640 for code/branches/core6/src/libraries/network

Timestamp:

Aug 11, 2013, 9:07:38 PM (11 years ago)

Author:

landauf

Message:

made IdentifierManager a self-initializing singleton

Location:

code/branches/core6/src/libraries/network

Files:

• packet/ClassID.cc (modified) (2 diffs)
• synchronisable/Synchronisable.cc (modified) (1 diff)

code/branches/core6/src/libraries/network/packet/ClassID.cc

@@ -55 +55 @@
 
   //calculate total needed size (for all strings and integers)
-  std::map<std::string, Identifier*>::const_iterator it = IdentifierManager::getStringIdentifierMapBegin();
-  for(;it != IdentifierManager::getStringIdentifierMapEnd();++it){
+  std::map<std::string, Identifier*>::const_iterator it = IdentifierManager::getInstance().getStringIdentifierMapBegin();
+  for(;it != IdentifierManager::getInstance().getStringIdentifierMapEnd();++it){
     id = it->second;
     if(id == NULL || !id->hasFactory())
@@ -129 +129 @@
 
   //clear the map of network ids
-  IdentifierManager::clearNetworkIDs();
+  IdentifierManager::getInstance().clearNetworkIDs();
 
   orxout(verbose, context::packets) << "=== processing classids: " << endl;

code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc

@@ -80 +80 @@
   {
     // delete callback function objects
-    if(!IdentifierManager::isCreatingHierarchy()){
+    if(!IdentifierManager::getInstance().isCreatingHierarchy()){
       // remove object from the static objectMap
       if (this->objectMode_ != 0x0 && (Host::running() && Host::isServer()))