Changeset 10916 for code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

File:

• code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc (modified) (5 diffs)

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

@@ -87 +87 @@
         for (std::list<const Identifier*>::const_iterator it = this->directParents_.begin(); it != this->directParents_.end(); ++it)
             const_cast<Identifier*>(*it)->directChildren_.erase(this);
-        for (const auto & elem : this->children_)
-            const_cast<Identifier*>(elem)->parents_.remove(this);
-        for (const auto & elem : this->directChildren_)
-            const_cast<Identifier*>(elem)->directParents_.remove(this);
-
-        for (auto & elem : this->configValues_)
-            delete (elem.second);
-        for (auto & elem : this->xmlportParamContainers_)
-            delete (elem.second);
-        for (auto & elem : this->xmlportObjectContainers_)
-            delete (elem.second);
+        for (const Identifier* child : this->children_)
+            const_cast<Identifier*>(child)->parents_.remove(this);
+        for (const Identifier* directChild : this->directChildren_)
+            const_cast<Identifier*>(directChild)->directParents_.remove(this);
+
+        for (auto& mapEntry : this->configValues_)
+            delete (mapEntry.second);
+        for (auto& mapEntry : this->xmlportParamContainers_)
+            delete (mapEntry.second);
+        for (auto& mapEntry : this->xmlportObjectContainers_)
+            delete (mapEntry.second);
     }
 
@@ -157 +157 @@
         if (this->directParents_.empty())
         {
-            for (const auto & elem : initializationTrace)
-                if (elem != this)
-                    this->parents_.push_back(elem);
+            for (const Identifier* identifier : initializationTrace)
+                if (identifier != this)
+                    this->parents_.push_back(identifier);
         }
         else
@@ -261 +261 @@
 
         // if any parent class is virtual, it will be instantiated first, so we need to add them first.
-        for (const auto & elem : this->parents_)
-        {
-            if ((elem)->isVirtualBase())
+        for (const Identifier* parent : this->parents_)
+        {
+            if (parent->isVirtualBase())
             {
-                for (std::list<const Identifier*>::const_iterator it_parent_parent = const_cast<Identifier*>(elem)->parents_.begin(); it_parent_parent != const_cast<Identifier*>(elem)->parents_.end(); ++it_parent_parent)
+                for (std::list<const Identifier*>::const_iterator it_parent_parent = const_cast<Identifier*>(parent)->parents_.begin(); it_parent_parent != const_cast<Identifier*>(parent)->parents_.end(); ++it_parent_parent)
                     this->addIfNotExists(expectedIdentifierTrace, *it_parent_parent);
-                this->addIfNotExists(expectedIdentifierTrace, elem);
+                this->addIfNotExists(expectedIdentifierTrace, parent);
             }
         }
 
         // now all direct parents get created recursively. already added identifiers (e.g. virtual base classes) are not added again.
-        for (const auto & elem : this->directParents_)
-        {
-            for (std::list<const Identifier*>::const_iterator it_parent_parent = const_cast<Identifier*>(elem)->parents_.begin(); it_parent_parent != const_cast<Identifier*>(elem)->parents_.end(); ++it_parent_parent)
+        for (const Identifier* directParent : this->directParents_)
+        {
+            for (std::list<const Identifier*>::const_iterator it_parent_parent = const_cast<Identifier*>(directParent)->parents_.begin(); it_parent_parent != const_cast<Identifier*>(directParent)->parents_.end(); ++it_parent_parent)
                 this->addIfNotExists(expectedIdentifierTrace, *it_parent_parent);
-            this->addIfNotExists(expectedIdentifierTrace, elem);
+            this->addIfNotExists(expectedIdentifierTrace, directParent);
         }
 
@@ -285 +285 @@
 
             orxout(internal_warning) << "  Actual trace (after creating a sample instance):" << endl << "    ";
-            for (const auto & elem : this->parents_)
-                orxout(internal_warning) << " " << (elem)->getName();
+            for (const Identifier* parent : this->parents_)
+                orxout(internal_warning) << " " << parent->getName();
             orxout(internal_warning) << endl;
 
@@ -295 +295 @@
 
             orxout(internal_warning) << "  Direct parents (according to class hierarchy definitions):" << endl << "    ";
-            for (const auto & elem : this->directParents_)
-                orxout(internal_warning) << " " << (elem)->getName();
+            for (const Identifier* directParent : this->directParents_)
+                orxout(internal_warning) << " " << directParent->getName();
             orxout(internal_warning) << endl;
         }