Changeset 10768 for code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.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/collisionshapes/CompoundCollisionShape.cc (modified) (3 diffs)

code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -197 +197 @@
     void CompoundCollisionShape::updatePublicShape()
     {
-        btCollisionShape* primitive = 0; // The primitive shape, if there is one.
+        btCollisionShape* primitive = nullptr; // The primitive shape, if there is one.
         bool bPrimitive = true; // Whether the CompoundCollisionShape has just one non-empty CollisionShape. And that shape also has no transformation.
         bool bEmpty = true; // Whether the CompoundCollisionShape is empty.
@@ -221 +221 @@
         {
             // If there was none all along, nothing needs to be changed.
-            if (this->collisionShape_ == 0)
+            if (this->collisionShape_ == nullptr)
                 return;
-            this->collisionShape_ = 0;
+            this->collisionShape_ = nullptr;
         }
         // If the CompoundCollisionShape is just a primitive.
@@ -253 +253 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }