Changeset 10916 for code/branches/cpp11_v2/src/libraries/core/Namespace.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/Namespace.cc (modified) (6 diffs)

code/branches/cpp11_v2/src/libraries/core/Namespace.cc

@@ -53 +53 @@
     {
         if (this->bRoot_)
-            for (auto & elem : this->representingNamespaces_)
-                delete elem;
+            for (NamespaceNode* node : this->representingNamespaces_)
+                delete node;
     }
 
@@ -80 +80 @@
             for (unsigned int i = 0; i < tokens.size(); i++)
             {
-                for (auto & elem : this->getNamespace()->representingNamespaces_)
+                for (NamespaceNode* node : this->getNamespace()->representingNamespaces_)
                 {
-                    std::set<NamespaceNode*> temp = elem->getNodeRelative(tokens[i]);
+                    std::set<NamespaceNode*> temp = node->getNodeRelative(tokens[i]);
                     this->representingNamespaces_.insert(temp.begin(), temp.end());
                 }
@@ -93 +93 @@
         if (this->bAutogeneratedFileRootNamespace_)
         {
-            for (auto & elem : this->representingNamespaces_)
+            for (NamespaceNode* node : this->representingNamespaces_)
             {
-                elem->setRoot(true);
-                elem->setHidden(true);
+                node->setRoot(true);
+                node->setHidden(true);
             }
         }
@@ -114 +114 @@
     bool Namespace::includes(const Namespace* ns) const
     {
-        for (const auto & elem1 : this->representingNamespaces_)
+        for (NamespaceNode* node1 : this->representingNamespaces_)
         {
-            for (const auto & elem2 : ns->representingNamespaces_)
+            for (NamespaceNode* node2 : ns->representingNamespaces_)
             {
-                if (elem1->includes(elem2))
+                if (node1->includes(node2))
                 {
                     if (this->operator_ == "or")
@@ -149 +149 @@
 
         int i = 0;
-        for (const auto & elem : this->representingNamespaces_)
+        for (NamespaceNode* node : this->representingNamespaces_)
         {
             if (i > 0)
                 output += " / ";
 
-            output += elem->toString();
+            output += node->toString();
             i++;
         }
@@ -166 +166 @@
 
         int i = 0;
-        for (const auto & elem : this->representingNamespaces_)
+        for (NamespaceNode* node : this->representingNamespaces_)
         {
             if (i > 0)
                 output += '\n';
 
-            output += elem->toString(indentation);
+            output += node->toString(indentation);
             i++;
         }