Changeset 9634 for code/branches/core6/src/libraries/core

Timestamp:

Aug 11, 2013, 2:36:31 PM (11 years ago)

Author:

landauf

Message:

reset static maps and variables after destroying identifiers
iterate over the same map in createClassHierarchy() an in destroyAllIdentifiers()

Location:

code/branches/core6/src/libraries/core/class

Files:

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

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

@@ -294 +294 @@
             {
                 SuperFunctionDestruction<0, T>::destroy(this);
+                classIdentifier_s = 0;
             }
 

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

@@ -86 +86 @@
         orxout(internal_status) << "Create class-hierarchy" << endl;
         IdentifierManager::startCreatingHierarchy();
-        for (std::map<std::string, Identifier*>::const_iterator it = IdentifierManager::getStringIdentifierMap().begin(); it != IdentifierManager::getStringIdentifierMap().end(); ++it)
+        for (std::map<std::string, Identifier*>::const_iterator it = IdentifierManager::getTypeIDIdentifierMap().begin(); it != IdentifierManager::getTypeIDIdentifierMap().end(); ++it)
         {
             // To create the new branch of the class-hierarchy, we create a new object and delete it afterwards.
@@ -106 +106 @@
         for (std::map<std::string, Identifier*>::iterator it = IdentifierManager::getTypeIDIdentifierMap().begin(); it != IdentifierManager::getTypeIDIdentifierMap().end(); ++it)
             delete (it->second);
+
+        IdentifierManager::getTypeIDIdentifierMap().clear();
+        IdentifierManager::getStringIdentifierMapIntern().clear();
+        IdentifierManager::getLowercaseStringIdentifierMapIntern().clear();
+        IdentifierManager::getIDIdentifierMapIntern().clear();
     }