Changeset 11062 for code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.cc

Timestamp:

Jan 13, 2016, 11:13:30 PM (8 years ago)

Author:

landauf

Message:

added c++11 features to code that was modified in presentationHS15

File:

• code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.cc (modified) (3 diffs)

code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -312 +312 @@
         else
         {
-            return NULL;
+            return nullptr;
         }
     }
@@ -318 +318 @@
     void WeaponSystem::addMunition(Munition* munition)
     {
-        if (munition == NULL)
+        if (munition == nullptr)
         {
             return;
@@ -338 +338 @@
     void WeaponSystem::updateMunition()
     {
-        for (std::vector<WeaponPack*>::iterator it = this->weaponPacks_.begin(); it != this->weaponPacks_.end(); ++it)
-        {
-            (*it)->updateMunition();
+        for (WeaponPack* weaponPack : this->weaponPacks_)
+        {
+            weaponPack->updateMunition();
         }
     }