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

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

@@ -93 +93 @@
         {
             Context temporaryContext(nullptr);
-            for (auto identifier : this->identifiers_)
+            for (Identifier* identifier : this->identifiers_)
             {
-                
                 if (identifier->isInitialized())
                     continue;
@@ -127 +126 @@
 
         // finish the initialization of all identifiers
-        for (const auto & initializedIdentifier : initializedIdentifiers)
-            (initializedIdentifier)->finishInitialization();
+        for (Identifier* initializedIdentifier : initializedIdentifiers)
+            initializedIdentifier->finishInitialization();
 
         // only check class hierarchy in dev mode because it's an expensive operation and it requires a developer to fix detected problems anyway.
@@ -144 +143 @@
     {
         // check if there are any uninitialized identifiers remaining
-        for (const auto & elem : this->identifiers_)
-            if (!(elem)->isInitialized())
-                orxout(internal_error) << "Identifier was registered late and is not initialized: " << (elem)->getName() << " / " << (elem)->getTypeInfo().name() << endl;
+        for (Identifier* identifier : this->identifiers_)
+            if (!identifier->isInitialized())
+                orxout(internal_error) << "Identifier was registered late and is not initialized: " << identifier->getName() << " / " << identifier->getTypeInfo().name() << endl;
 
         // for all initialized identifiers, check if a sample instance behaves as expected according to the class hierarchy
         Context temporaryContext(nullptr);
-        for (const auto & initializedIdentifier : initializedIdentifiers)
+        for (Identifier* initializedIdentifier : initializedIdentifiers)
         {
-            if (!(initializedIdentifier)->hasFactory())
+            if (!initializedIdentifier->hasFactory())
                 continue;
 
-            Identifiable* temp = (initializedIdentifier)->fabricate(&temporaryContext);
-
-            for (const auto & elem : this->identifiers_)
+            Identifiable* temp = initializedIdentifier->fabricate(&temporaryContext);
+
+            for (Identifier* identifier : this->identifiers_)
             {
-                bool isA_AccordingToRtti = (elem)->canDynamicCastObjectToIdentifierClass(temp);
-                bool isA_AccordingToClassHierarchy = temp->isA((elem));
+                bool isA_AccordingToRtti = identifier->canDynamicCastObjectToIdentifierClass(temp);
+                bool isA_AccordingToClassHierarchy = temp->isA(identifier);
 
                 if (isA_AccordingToRtti != isA_AccordingToClassHierarchy)
                 {
-                    orxout(internal_error) << "Class hierarchy does not match RTTI: Class hierarchy claims that " << (initializedIdentifier)->getName() <<
-                        (isA_AccordingToClassHierarchy ? " is a " : " is not a ") << (elem)->getName() << " but RTTI says the opposite." << endl;
+                    orxout(internal_error) << "Class hierarchy does not match RTTI: Class hierarchy claims that " << initializedIdentifier->getName() <<
+                        (isA_AccordingToClassHierarchy ? " is a " : " is not a ") << identifier->getName() << " but RTTI says the opposite." << endl;
                 }
             }
@@ -184 +183 @@
     {
         orxout(internal_status) << "Destroy class-hierarchy" << endl;
-        for (const auto & elem : this->identifiers_)
-            (elem)->reset();
+        for (Identifier* identifier : this->identifiers_)
+            identifier->reset();
     }
 
@@ -260 +259 @@
     {
         // TODO: use std::type_index and a map to find identifiers by type_info (only with c++11)
-        for (const auto & elem : this->identifiers_)
-            if ((elem)->getTypeInfo() == typeInfo)
-                return (elem);
+        for (Identifier* identifer : this->identifiers_)
+            if (identifer->getTypeInfo() == typeInfo)
+                return identifer;
         return nullptr;
     }