Changeset 10768 for code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc

Timestamp:

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

Author:

landauf

Message:

replace '0' by 'nullptr'

File:

• code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc (modified) (4 diffs)

code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc

@@ -140 +140 @@
     {
       mem += header.getDataSize() + header.getSize();
-      return 0;
+      return nullptr;
     }
 //     assert( !header.isDiffed() );
@@ -156 +156 @@
     }
     assert(id);
-    Context* context = 0;
+    Context* context = nullptr;
     if (header.getContextID() != OBJECTID_UNKNOWN)
     {
@@ -164 +164 @@
         mem += header.getDataSize()+SynchronisableHeader::getSize(); //.TODO: this suckz.... remove size from header
         assert(0); // TODO: uncomment this if we have a clean objecthierarchy (with destruction of children of objects) ^^
-        return 0;
+        return nullptr;
       }
       else
@@ -172 +172 @@
       context = Context::getRootContext();
 
-    assert(getSynchronisable(header.getObjectID())==0);   //make sure no object with this id exists
+    assert(getSynchronisable(header.getObjectID())==nullptr);   //make sure no object with this id exists
     BaseObject *bo = orxonox_cast<BaseObject*>(id->fabricate(context));
     assert(bo);