Changeset 10916 for code/branches/cpp11_v2/src/libraries/core/module

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

Location:

code/branches/cpp11_v2/src/libraries/core/module

Files:

• DynLibManager.cc (modified) (1 diff)
• ModuleInstance.cc (modified) (2 diffs)
• PluginManager.cc (modified) (2 diffs)
• StaticInitializationManager.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/core/module/DynLibManager.cc

@@ -75 +75 @@
     {
         // Unload & delete resources in turn
-        for (auto & elem : mLibList)
+        for (auto& mapEntry : mLibList)
         {
-            elem.second->unload();
-            delete elem.second;
+            mapEntry.second->unload();
+            delete mapEntry.second;
         }
 

code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc

@@ -59 +59 @@
     {
         const std::set<StaticallyInitializedInstance*>& instances = this->staticallyInitializedInstancesByType_[type];
-        for (const auto & instance : instances)
-            (instance)->load();
+        for (StaticallyInitializedInstance* instance : instances)
+            instance->load();
     }
 
@@ -75 +75 @@
         std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*>> copy(this->staticallyInitializedInstancesByType_);
         this->staticallyInitializedInstancesByType_.clear();
-        for (auto & elem : copy)
-            for (std::set<StaticallyInitializedInstance*>::iterator it2 = elem.second.begin(); it2 != elem.second.end(); ++it2)
+        for (auto& mapEntry : copy)
+            for (std::set<StaticallyInitializedInstance*>::iterator it2 = mapEntry.second.begin(); it2 != mapEntry.second.end(); ++it2)
                 delete (*it2);
     }

code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc

@@ -59 +59 @@
         ModifyConsoleCommand("PluginManager", __CC_PluginManager_unload_name).setObject(nullptr);
 
-        for (auto & elem : this->references_)
-            delete elem.second;
-        for (auto & elem : this->plugins_)
-            delete elem.second;
+        for (auto& mapEntry : this->references_)
+            delete mapEntry.second;
+        for (auto& mapEntry : this->plugins_)
+            delete mapEntry.second;
     }
 
@@ -68 +68 @@
     {
         const std::vector<std::string>& pluginPaths = ApplicationPaths::getInstance().getPluginPaths();
-        for (auto libraryName : pluginPaths)
+        for (const std::string& libraryName : pluginPaths)
         {
             std::string name;
-            
             std::string filename = libraryName +  + specialConfig::pluginExtension;
             std::ifstream infile(filename.c_str());

code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.cc

@@ -50 +50 @@
     {
         // attention: loading a module may add new handlers to the list
-        for (auto & elem : this->handlers_)
-            (elem)->loadModule(module);
+        for (StaticInitializationHandler* handler : this->handlers_)
+            handler->loadModule(module);
     }