Changeset 10475 for code/branches/core7/src/libraries/network/packet/FunctionIDs.cc

Timestamp:

May 25, 2015, 2:41:57 PM (9 years ago)

Author:

landauf

Message:

refactored the interface of NetworkFunctionManager: maps are better encapsulated now

File:

• code/branches/core7/src/libraries/network/packet/FunctionIDs.cc (modified) (2 diffs)

code/branches/core7/src/libraries/network/packet/FunctionIDs.cc

@@ -56 +56 @@
 
   //calculate total needed size (for all strings and integers)
-  std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionManager::getInstance().getNameMap();
-  std::map<std::string, NetworkFunctionBase*>::iterator it;
-  for (it = map.begin(); it != map.end(); ++it)
+  const std::set<NetworkFunctionBase*>& set = NetworkFunctionManager::getInstance().getAllFunctions();
+  std::set<NetworkFunctionBase*>::const_iterator it;
+  for (it = set.begin(); it != set.end(); ++it)
   {
-    const std::string& functionname = it->second->getName();
-    networkID = it->second->getNetworkID();
+    const std::string& functionname = (*it)->getName();
+    networkID = (*it)->getNetworkID();
     // now push the network id and the classname to the stack
     tempQueue.push( std::pair<unsigned int, std::string>(networkID, functionname) );
@@ -140 +140 @@
     functionname = temp+2*sizeof(uint32_t);
     orxout(internal_info, context::packets) << "processing functionid: " << networkID << " name: " << functionname << endl;
-    NetworkFunctionManager::getInstance().setNetworkID((const char*)functionname, networkID);
+    NetworkFunctionManager::getInstance().getFunctionByName((const char*)functionname)->setNetworkID(networkID);
     temp += 2*sizeof(uint32_t) + stringsize;
   }