Changeset 10765 for code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.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/orxonox/controllers/ScriptController.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.cc

@@ -64 +64 @@
         /* Set default values for all variables */
         /* - pointers to zero */
-        this->player_ = NULL;
-        this->entity_ = NULL;
+        this->player_ = nullptr;
+        this->entity_ = nullptr;
 
         /* - times */
@@ -138 +138 @@
       
       }
-      return NULL;
+      return nullptr;
     }