use modern construct 'nullptr' instead of 'NULL' or '0'

[platform/core/uifw/dali-core.git] / dali / public-api / common / dali-vector.cpp

diff --git a/dali/public-api/common/dali-vector.cpp b/dali/public-api/common/dali-vector.cpp
index 31fad54..4acbe52 100644 (file)
--- a/dali/public-api/common/dali-vector.cpp
+++ b/dali/public-api/common/dali-vector.cpp
@@ -25,7 +25,7 @@ namespace Dali
 {
 
 VectorBase::VectorBase()
-  : mData( NULL )
+  : mData( nullptr )
 {
 }
 
@@ -53,7 +53,7 @@ void VectorBase::Release()
     SizeType* metadata = reinterpret_cast< SizeType* >( mData );
 
     delete [] ( metadata - 2u );
-    mData = 0u;
+    mData = nullptr;
   }
 }
 
@@ -120,8 +120,8 @@ void VectorBase::Erase( char* address, SizeType elementSize )
   // erase can be called on an unallocated vector
   if( mData )
   {
-    char* startAddress = address + elementSize;
-    const char* endAddress = reinterpret_cast< char* >( mData ) + Count() * elementSize;
+    uint8_t* startAddress = reinterpret_cast< uint8_t* >( address ) + elementSize;
+    const uint8_t* endAddress = reinterpret_cast< uint8_t* >( mData ) + Count() * elementSize;
     SizeType numberOfBytes = endAddress - startAddress;
     // addresses overlap so use memmove
     memmove( address, startAddress, numberOfBytes );
@@ -131,12 +131,12 @@ void VectorBase::Erase( char* address, SizeType elementSize )
 
 char* VectorBase::Erase( char* first, char* last, SizeType elementSize )
 {
-  char* next = NULL;
+  char* next = nullptr;
 
   if( mData )
   {
-    char* startAddress = last;
-    const char* endAddress = reinterpret_cast< char* >( mData ) + Count() * elementSize;
+    uint8_t* startAddress = reinterpret_cast< uint8_t* >( last );
+    const uint8_t* endAddress = reinterpret_cast< uint8_t* >( mData ) + Count() * elementSize;
     SizeType numberOfBytes = endAddress - startAddress;
     // addresses overlap so use memmove
     memmove( first, startAddress, numberOfBytes );