Changeset 10765 for code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.cc

Timestamp:

Nov 4, 2015, 10:25:42 PM (9 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

File:

• code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.cc

@@ -107 +107 @@
         {
             PickupCarrier* carrier = this->getCarrier();
-            if(this->getMetaType() != pickupMetaType::none && carrier != NULL)
+            if(this->getMetaType() != pickupMetaType::none && carrier != nullptr)
             {
                 // If the metaType is destroyCarrier, then the PickupCarrier is destroyed.
@@ -121 +121 @@
                 {
                     Pickupable* pickup = (*it);
-                    if(pickup == NULL || pickup == this)
+                    if(pickup == nullptr || pickup == this)
                         continue;