Changeset 10821 for code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.cc

Timestamp:

Nov 21, 2015, 7:05:53 PM (8 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

File:

• code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.cc (modified) (3 diffs)

code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.cc

@@ -504 +504 @@
     bool MultiTrigger::checkAnd(BaseObject* triggerer)
     {
-        for(std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
-        {
-            TriggerBase* trigger = *it;
+        for(auto trigger : this->children_)
+        {
+            
             if(trigger->isMultiTrigger())
             {
@@ -531 +531 @@
     bool MultiTrigger::checkOr(BaseObject* triggerer)
     {
-        for(std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
-        {
-            TriggerBase* trigger = *it;
+        for(auto trigger : this->children_)
+        {
+            
             if(trigger->isMultiTrigger())
             {
@@ -559 +559 @@
     {
         bool triggered = false;
-        for(std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
-        {
-            TriggerBase* trigger = *it;
+        for(auto trigger : this->children_)
+        {
+            
             if(triggered)
             {