Changeset 10821 for code/branches/cpp11_v2/src/orxonox/interfaces

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/orxonox/interfaces

Files:

• PickupCarrier.cc (modified) (1 diff)
• Pickupable.cc (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.cc

@@ -135 +135 @@
         // Go recursively through all children to check whether they are the target.
         std::vector<PickupCarrier*>* children = this->getCarrierChildren();
-        for(std::vector<PickupCarrier*>::iterator it = children->begin(); it != children->end(); it++)
+        for(auto & elem : *children)
         {
-            if(pickup->isTarget(*it))
+            if(pickup->isTarget(elem))
             {
-                target = *it;
+                target = elem;
                 break;
             }

code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.cc

@@ -160 +160 @@
     {
         // Iterate through all targets of this Pickupable.
-        for(std::list<Identifier*>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++)
+        for(const auto & elem : this->targets_)
         {
-            if(identifier->isA(*it))
+            if(identifier->isA(elem))
                 return true;
         }