Changeset 10765 for code/branches/cpp11_v2/src/libraries/tools

Timestamp:

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

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/src/libraries/tools

Files:

• ResourceCollection.cc (modified) (1 diff)
• Shader.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.cc

@@ -93 +93 @@
     {
         if (index >= resourceLocations_.size())
-            return NULL;
+            return nullptr;
         else
             return resourceLocations_[index];

code/branches/cpp11_v2/src/libraries/tools/Shader.cc

@@ -109 +109 @@
     {
         // For the moment, we get the viewport always from the graphics manager
-        // TODO: Try to support multiple viewports - note however that scenemanager_->getCurrentViewport() returns NULL
+        // TODO: Try to support multiple viewports - note however that scenemanager_->getCurrentViewport() returns nullptr
         //       after switching to a camera in a different scene (only for the first time this scene is displayed though)
         this->changedCompositorName(GraphicsManager::getInstance().getViewport());