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

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

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 (DynLibList::iterator it = mLibList.begin(); it != mLibList.end(); ++it)
+        for (auto & elem : mLibList)
         {
-            it->second->unload();
-            delete it->second;
+            elem.second->unload();
+            delete elem.second;
         }
 

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

@@ -59 +59 @@
     {
         const std::set<StaticallyInitializedInstance*>& instances = this->staticallyInitializedInstancesByType_[type];
-        for (std::set<StaticallyInitializedInstance*>::iterator it = instances.begin(); it != instances.end(); ++it)
-            (*it)->load();
+        for (const auto & instance : instances)
+            (instance)->load();
     }
 
@@ -75 +75 @@
         std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*>> copy(this->staticallyInitializedInstancesByType_);
         this->staticallyInitializedInstancesByType_.clear();
-        for (std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*>>::iterator it1 = copy.begin(); it1 != copy.end(); ++it1)
-            for (std::set<StaticallyInitializedInstance*>::iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2)
+        for (auto & elem : copy)
+            for (std::set<StaticallyInitializedInstance*>::iterator it2 = elem.second.begin(); it2 != elem.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 (std::map<std::string, PluginReference*>::iterator it = this->references_.begin(); it != this->references_.end(); ++it)
-            delete it->second;
-        for (std::map<std::string, Plugin*>::iterator it = this->plugins_.begin(); it != this->plugins_.end(); ++it)
-            delete it->second;
+        for (auto & elem : this->references_)
+            delete elem.second;
+        for (auto & elem : this->plugins_)
+            delete elem.second;
     }
 
@@ -68 +68 @@
     {
         const std::vector<std::string>& pluginPaths = ApplicationPaths::getInstance().getPluginPaths();
-        for (std::vector<std::string>::const_iterator it = pluginPaths.begin(); it != pluginPaths.end(); ++it)
+        for (auto libraryName : pluginPaths)
         {
             std::string name;
-            std::string libraryName = (*it);
+            
             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 (std::list<StaticInitializationHandler*>::iterator it = this->handlers_.begin(); it != this->handlers_.end(); ++it)
-            (*it)->loadModule(module);
+        for (auto & elem : this->handlers_)
+            (elem)->loadModule(module);
     }