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

[platform/core/uifw/dali-core.git] / dali / internal / common / message-buffer.cpp

diff --git a/dali/internal/common/message-buffer.cpp b/dali/internal/common/message-buffer.cpp
index 869bcfc..1621567 100644 (file)
--- a/dali/internal/common/message-buffer.cpp
+++ b/dali/internal/common/message-buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,16 +29,16 @@ namespace // unnamed namespace
 {
 
 // Increase capacity by 1.5 when buffer limit reached
-const unsigned int INCREMENT_NUMERATOR   = 3u;
-const unsigned int INCREMENT_DENOMINATOR = 2u;
+const uint32_t INCREMENT_NUMERATOR   = 3u;
+const uint32_t INCREMENT_DENOMINATOR = 2u;
 
-const unsigned int MESSAGE_SIZE_FIELD = 1u; // Size required to mark the message size
-const unsigned int MESSAGE_END_FIELD  = 1u; // Size required to mark the end of messages
+const uint32_t MESSAGE_SIZE_FIELD = 1u; // Size required to mark the message size
+const uint32_t MESSAGE_END_FIELD  = 1u; // Size required to mark the end of messages
 
-const unsigned int MESSAGE_SIZE_PLUS_END_FIELD = MESSAGE_SIZE_FIELD + MESSAGE_END_FIELD;
+const uint32_t MESSAGE_SIZE_PLUS_END_FIELD = MESSAGE_SIZE_FIELD + MESSAGE_END_FIELD;
 
-const unsigned int MAX_DIVISION_BY_WORD_REMAINDER = sizeof(Dali::Internal::MessageBuffer::WordType) - 1u; // For word alignment on ARM
-const unsigned int WORD_SIZE = sizeof(Dali::Internal::MessageBuffer::WordType);
+const std::size_t MAX_DIVISION_BY_WORD_REMAINDER = sizeof(Dali::Internal::MessageBuffer::WordType) - 1u; // For word alignment on ARM
+const std::size_t WORD_SIZE = sizeof(Dali::Internal::MessageBuffer::WordType);
 
 } // unnamed namespace
 
@@ -50,8 +50,8 @@ namespace Internal
 
 MessageBuffer::MessageBuffer( std::size_t initialCapacity )
 : mInitialCapacity( initialCapacity / WORD_SIZE ),
-  mData( NULL ),
-  mNextSlot( NULL ),
+  mData( nullptr ),
+  mNextSlot( nullptr ),
   mCapacity( 0 ),
   mSize( 0 )
 {
@@ -62,7 +62,7 @@ MessageBuffer::~MessageBuffer()
   free( mData );
 }
 
-unsigned int* MessageBuffer::ReserveMessageSlot( std::size_t size )
+uint32_t* MessageBuffer::ReserveMessageSlot( std::size_t size )
 {
   DALI_ASSERT_DEBUG( 0 != size );
 
@@ -97,8 +97,7 @@ unsigned int* MessageBuffer::ReserveMessageSlot( std::size_t size )
   // End marker
   *mNextSlot = 0;
 
-  // @todo Remove cast & change all messages to use WordType instead
-  return reinterpret_cast<unsigned int*>(slot);
+  return reinterpret_cast<uint32_t*>(slot);
 }
 
 std::size_t MessageBuffer::GetCapacity() const
@@ -113,7 +112,7 @@ MessageBuffer::Iterator MessageBuffer::Begin() const
     return Iterator( mData );
   }
 
-  return Iterator( NULL );
+  return Iterator( nullptr );
 }
 
 void MessageBuffer::Reset()
@@ -146,7 +145,7 @@ void MessageBuffer::IncreaseCapacity( std::size_t newCapacity )
   {
     mData = reinterpret_cast<WordType*>( malloc( newCapacity * WORD_SIZE ) );
   }
-  DALI_ASSERT_ALWAYS( NULL != mData );
+  DALI_ASSERT_ALWAYS( nullptr != mData );
 
   mCapacity = newCapacity;
   mNextSlot = mData + mSize;
@@ -156,18 +155,14 @@ MessageBuffer::Iterator::Iterator(WordType* current)
 : mCurrent(current),
   mMessageSize(0)
 {
-  if( NULL != mCurrent )
+  if( nullptr != mCurrent )
   {
     // The first word is the size of the following object
     mMessageSize = *mCurrent++;
   }
 }
 
-MessageBuffer::Iterator::Iterator(const Iterator& copy)
-: mCurrent( copy.mCurrent ),
-  mMessageSize( copy.mMessageSize )
-{
-}
+MessageBuffer::Iterator::Iterator(const Iterator& copy) = default;
 
 } // namespace Internal