Changeset 10821 for code/branches/cpp11_v2/src/libraries/util/output

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/util/output

Files:

• BaseWriter.cc (modified) (1 diff)
• MemoryWriter.cc (modified) (1 diff)
• OutputListener.cc (modified) (3 diffs)
• OutputManager.cc (modified) (4 diffs)
• SubcontextOutputListener.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.cc

@@ -116 +116 @@
 
         // iterate over all strings in the config-vector
-        for (size_t i = 0; i < this->configurableAdditionalContexts_.size(); ++i)
+        for (auto & full_name : this->configurableAdditionalContexts_)
         {
-            const std::string& full_name = this->configurableAdditionalContexts_[i];
+            
 
             // split the name into main-name and sub-name (if given; otherwise sub-name remains empty). both names are separated by ::

code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.cc

@@ -65 +65 @@
     void MemoryWriter::resendOutput(OutputListener* listener) const
     {
-        for (size_t i = 0; i < this->messages_.size(); ++i)
+        for (auto & message : this->messages_)
         {
-            const Message& message = this->messages_[i];
+            
             listener->unfilteredOutput(message.level, *message.context, message.lines);
         }

code/branches/cpp11_v2/src/libraries/util/output/OutputListener.cc

@@ -111 +111 @@
         this->levelMask_ = mask;
 
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            this->listeners_[i]->updatedLevelMask(this);
+        for (auto & elem : this->listeners_)
+            elem->updatedLevelMask(this);
     }
 
@@ -142 +142 @@
         this->additionalContextsLevelMask_ = mask;
 
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            this->listeners_[i]->updatedAdditionalContextsLevelMask(this);
+        for (auto & elem : this->listeners_)
+            elem->updatedAdditionalContextsLevelMask(this);
     }
 
@@ -153 +153 @@
         this->additionalContextsMask_ = mask;
 
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            this->listeners_[i]->updatedAdditionalContextsMask(this);
+        for (auto & elem : this->listeners_)
+            elem->updatedAdditionalContextsMask(this);
     }
 

code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc

@@ -132 +132 @@
         vectorize(message, '\n', &lines);
 
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            this->listeners_[i]->unfilteredOutput(level, context, lines);
+        for (auto & elem : this->listeners_)
+            elem->unfilteredOutput(level, context, lines);
     }
 
@@ -179 +179 @@
     {
         int mask = 0;
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            mask |= this->listeners_[i]->getLevelMask();
+        for (auto & elem : this->listeners_)
+            mask |= elem->getLevelMask();
         this->combinedLevelMask_ = static_cast<OutputLevel>(mask);
     }
@@ -190 +190 @@
     {
         int mask = 0;
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            mask |= this->listeners_[i]->getAdditionalContextsLevelMask();
+        for (auto & elem : this->listeners_)
+            mask |= elem->getAdditionalContextsLevelMask();
         this->combinedAdditionalContextsLevelMask_ = static_cast<OutputLevel>(mask);
     }
@@ -201 +201 @@
     {
         this->combinedAdditionalContextsMask_ = 0;
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            this->combinedAdditionalContextsMask_ |= this->listeners_[i]->getAdditionalContextsMask();
+        for (auto & elem : this->listeners_)
+            this->combinedAdditionalContextsMask_ |= elem->getAdditionalContextsMask();
     }
 

code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.cc

@@ -79 +79 @@
 
         // compose the mask of subcontexts and build the set of sub-context-IDs
-        for (std::set<const OutputContextContainer*>::const_iterator it = subcontexts.begin(); it != subcontexts.end(); ++it)
+        for (const auto & subcontext : subcontexts)
         {
-            this->subcontextsCheckMask_ |= (*it)->mask;
-            this->subcontexts_.insert((*it)->sub_id);
+            this->subcontextsCheckMask_ |= (subcontext)->mask;
+            this->subcontexts_.insert((subcontext)->sub_id);
         }