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

[platform/core/uifw/dali-core.git] / dali / internal / update / controllers / render-message-dispatcher.cpp

diff --git a/dali/internal/update/controllers/render-message-dispatcher.cpp b/dali/internal/update/controllers/render-message-dispatcher.cpp
index 4b5040d..466697c 100644 (file)
--- a/dali/internal/update/controllers/render-message-dispatcher.cpp
+++ b/dali/internal/update/controllers/render-message-dispatcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 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.
@@ -40,9 +40,7 @@ RenderMessageDispatcher::RenderMessageDispatcher( RenderManager& renderManager,
 {
 }
 
-RenderMessageDispatcher::~RenderMessageDispatcher()
-{
-}
+RenderMessageDispatcher::~RenderMessageDispatcher() = default;
 
 void RenderMessageDispatcher::AddRenderer( OwnerPointer< Render::Renderer >& renderer )
 {
@@ -50,7 +48,7 @@ void RenderMessageDispatcher::AddRenderer( OwnerPointer< Render::Renderer >& ren
   typedef MessageValue1< RenderManager, OwnerPointer< Render::Renderer > > DerivedType;
 
   // Reserve some memory inside the render queue
-  unsigned int* slot = mRenderQueue.ReserveMessageSlot( mBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
+  uint32_t* slot = mRenderQueue.ReserveMessageSlot( mBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
 
   // Construct message in the render queue memory; note that delete should not be called on the return value
   new (slot) DerivedType( &mRenderManager, &RenderManager::AddRenderer, renderer );
@@ -58,10 +56,10 @@ void RenderMessageDispatcher::AddRenderer( OwnerPointer< Render::Renderer >& ren
 
 void RenderMessageDispatcher::RemoveRenderer( Render::Renderer& renderer )
 {
-  typedef MessageValue1< RenderManager, Render::Renderer* > DerivedType;
+  using DerivedType = MessageValue1<RenderManager, Render::Renderer*>;
 
   // Reserve some memory inside the render queue
-  unsigned int* slot = mRenderQueue.ReserveMessageSlot( mBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
+  uint32_t* slot = mRenderQueue.ReserveMessageSlot( mBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
 
   // Construct message in the render queue memory; note that delete should not be called on the return value
   new (slot) DerivedType( &mRenderManager, &RenderManager::RemoveRenderer, &renderer );
@@ -69,10 +67,10 @@ void RenderMessageDispatcher::RemoveRenderer( Render::Renderer& renderer )
 
 void RenderMessageDispatcher::AddRenderTracker( Render::RenderTracker& renderTracker )
 {
-  typedef MessageValue1< RenderManager, Render::RenderTracker* > DerivedType;
+  using DerivedType = MessageValue1<RenderManager, Render::RenderTracker*>;
 
   // Reserve some memory inside the render queue
-  unsigned int* slot = mRenderQueue.ReserveMessageSlot( mBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
+  uint32_t* slot = mRenderQueue.ReserveMessageSlot( mBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
 
   // Construct message in the render queue memory; note that delete should not be called on the return value
   new (slot) DerivedType( &mRenderManager, &RenderManager::AddRenderTracker, &renderTracker );
@@ -80,10 +78,10 @@ void RenderMessageDispatcher::AddRenderTracker( Render::RenderTracker& renderTra
 
 void RenderMessageDispatcher::RemoveRenderTracker( Render::RenderTracker& renderTracker )
 {
-  typedef MessageValue1< RenderManager, Render::RenderTracker* > DerivedType;
+  using DerivedType = MessageValue1<RenderManager, Render::RenderTracker*>;
 
   // Reserve some memory inside the render queue
-  unsigned int* slot = mRenderQueue.ReserveMessageSlot( mBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
+  uint32_t* slot = mRenderQueue.ReserveMessageSlot( mBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
 
   // Construct message in the render queue memory; note that delete should not be called on the return value
   new (slot) DerivedType( &mRenderManager, &RenderManager::RemoveRenderTracker, &renderTracker );