Merge "Clean up the code to build successfully on macOS" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / update / common / uniform-map.cpp

diff --git a/dali/internal/update/common/uniform-map.cpp b/dali/internal/update/common/uniform-map.cpp
index 72af02a..c68ac13 100644 (file)
--- a/dali/internal/update/common/uniform-map.cpp
+++ b/dali/internal/update/common/uniform-map.cpp
@@ -23,10 +23,7 @@ namespace Internal
 {
 namespace SceneGraph
 {
-
-UniformMap::UniformMap()
-{
-}
+UniformMap::UniformMap() = default;
 
 UniformMap::~UniformMap()
 {
@@ -148,7 +145,7 @@ const PropertyInputImpl* UniformMap::Find( const std::string& uniformName )
       }
     }
   }
-  return NULL;
+  return nullptr;
 }
 
 UniformMap::SizeType UniformMap::Count() const