Changeset 10768 for code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc

Timestamp:

Nov 6, 2015, 10:54:34 PM (8 years ago)

Author:

landauf

Message:

replace '0' by 'nullptr'

File:

• code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc (modified) (4 diffs)

code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc

@@ -44 +44 @@
         RegisterObject(WeaponPack);
 
-        this->weaponSystem_ = 0;
+        this->weaponSystem_ = nullptr;
     }
 
@@ -107 +107 @@
         assert(it != this->weapons_.end());
         this->weapons_.erase(it);
-        weapon->setWeaponPack(0);
+        weapon->setWeaponPack(nullptr);
     }
 
@@ -121 +121 @@
         }
 
-        return 0;
+        return nullptr;
     }
 
@@ -139 +139 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }