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

Timestamp:

Nov 21, 2015, 7:05:53 PM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -loop-convert

• Again, not all possible loops were converted
• It can do pretty cool transformations, but I had to fix a few compile errors, so there might be some runtime errors lurking around too

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