(Vector) Restore some VectorBase methods to preserve binary compatibility

Change-Id: I7f86af240ee72737f4d43958f33b04526c9c9848

diff --git a/dali/public-api/common/dali-vector.cpp b/dali/public-api/common/dali-vector.cpp
index bb6014fa01bed17c64e7dccc2197e6d975a3043d..bae8522be44f02e6a71db3876368c0a96bb98ac4 100644 (file)
--- a/dali/public-api/common/dali-vector.cpp
+++ b/dali/public-api/common/dali-vector.cpp
@@ -115,12 +115,12 @@ void VectorBase::Swap( VectorBase& vector )
   std::swap( mData, vector.mData );
 }
 
-void VectorBase::Erase( uint8_t* address, SizeType elementSize )
+void VectorBase::Erase( char* address, SizeType elementSize )
 {
   // erase can be called on an unallocated vector
   if( mData )
   {
-    uint8_t* startAddress = address + 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
@@ -129,13 +129,13 @@ void VectorBase::Erase( uint8_t* address, SizeType elementSize )
   }
 }
 
-uint8_t* VectorBase::Erase( uint8_t* first, uint8_t* last, SizeType elementSize )
+char* VectorBase::Erase( char* first, char* last, SizeType elementSize )
 {
-  uint8_t* next = NULL;
+  char* next = NULL;
 
   if( mData )
   {
-    uint8_t* startAddress = last;
+    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
@@ -148,7 +148,7 @@ uint8_t* VectorBase::Erase( uint8_t* first, uint8_t* last, SizeType elementSize
   return next;
 }
 
-void VectorBase::CopyMemory( uint8_t* destination, const uint8_t* source, size_t numberOfBytes )
+void VectorBase::CopyMemory( char* destination, const char* source, size_t numberOfBytes )
 {
   if( ( ( source < destination ) && ( source + numberOfBytes > destination ) ) ||
       ( ( destination < source ) && ( destination + numberOfBytes > source ) ) )

diff --git a/dali/public-api/common/dali-vector.h b/dali/public-api/common/dali-vector.h
index be556acea3e174e693c9d1f1f866b592e1ac91ed..0efb790060ab82ef791947bf0f275e36fbfa8d37 100755 (executable)
--- a/dali/public-api/common/dali-vector.h
+++ b/dali/public-api/common/dali-vector.h
@@ -182,7 +182,7 @@ protected: // for Derived classes
    * @param[in] elementSize Size to erase
    * @pre Last element cannot be erased as there is nothing to move.
    */
-  void Erase( uint8_t* address, SizeType elementSize );
+  void Erase( char* address, SizeType elementSize );
 
   /**
    * @brief Erases a range of elements.
@@ -194,7 +194,7 @@ protected: // for Derived classes
    * @param[in] elementSize Size of one of the elements to be erased
    * @return Address pointing to the next element of the last one
    */
-  uint8_t* Erase( uint8_t* first, uint8_t* last, SizeType elementSize );
+  char* Erase( char* first, char* last, SizeType elementSize );
 
   /**
    * @brief Copies a number of bytes from \e source to \e destination.
@@ -206,11 +206,11 @@ protected: // for Derived classes
    * @param[in] source Pointer to the source address
    * @param[in] numberOfBytes The number of bytes to be copied
    */
-  void CopyMemory( uint8_t* destination, const uint8_t* source, size_t numberOfBytes );
+  void CopyMemory( char* destination, const char* source, size_t numberOfBytes );
 
 private:
 
-  // not copiable as it does not know the size of elements
+  // not copyable as it does not know the size of elements
   VectorBase( const VectorBase& ); ///< Undefined @SINCE_1_0.0
   VectorBase& operator=( const VectorBase& ); ///< Undefined @SINCE_1_0.0
 
@@ -323,7 +323,7 @@ protected: // API for deriving classes
    */
   void Erase( uint8_t* address, SizeType elementSize )
   {
-    VectorBase::Erase( address, elementSize );
+    VectorBase::Erase( reinterpret_cast< char* >( address ), elementSize );
   }
 
   /**
@@ -337,7 +337,7 @@ protected: // API for deriving classes
    */
   uint8_t* Erase( uint8_t* first, uint8_t* last, SizeType elementSize )
   {
-    return VectorBase::Erase( first, last, elementSize );
+    return reinterpret_cast< uint8_t* >( VectorBase::Erase( reinterpret_cast< char* >( first ), reinterpret_cast< char *>( last ), elementSize ) );
   }
 
   /**
@@ -370,12 +370,12 @@ protected: // API for deriving classes
     SetCount( newCount );
 
     // Move current items to a new position inside the vector.
-    CopyMemory( at + size,
-                at,
+    CopyMemory( reinterpret_cast< char* >( at + size ),
+                reinterpret_cast< const char* >( at ),
                 ( reinterpret_cast<uint8_t*>( mData ) + count * elementSize ) - at );
 
     // Copy the given items.
-    CopyMemory( at, from, size );
+    CopyMemory( reinterpret_cast< char* >( at ), reinterpret_cast< const char* >( from ), size );
   }
 };