Changeset 11054 for code/branches/cpp11_v3/src/orxonox/CameraManager.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/CameraManager.cc (modified) (2 diffs)

code/branches/cpp11_v3/src/orxonox/CameraManager.cc

@@ -60 +60 @@
             return this->cameraList_.front();
         else
-            return 0;
+            return nullptr;
     }
 
@@ -93 +93 @@
                 this->cameraList_.front()->setFocus();
             else
-                this->useCamera(NULL);
+                this->useCamera(nullptr);
         }
         else