Revert "License conversion from Flora to Apache 2.0"

[platform/core/uifw/dali-core.git] / dali / internal / update / queue / update-message-queue.cpp

diff --git a/dali/internal/update/queue/update-message-queue.cpp b/dali/internal/update/queue/update-message-queue.cpp
index adeb03d..6722aa9 100644 (file)
--- a/dali/internal/update/queue/update-message-queue.cpp
+++ b/dali/internal/update/queue/update-message-queue.cpp
@@ -18,7 +18,14 @@
 #include <dali/internal/update/queue/update-message-queue.h>
 
 // EXTERNAL INCLUDES
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wall"
 #include <boost/thread/mutex.hpp>
+#pragma clang diagnostic pop
+#else
+#include <boost/thread/mutex.hpp>
+#endif // ifdef __clang
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
@@ -184,11 +191,11 @@ unsigned int* MessageQueue::ReserveMessageSlot( std::size_t requestedSize, bool
     }
   }
 
-  // If we are inside core event processing, core will automatically flush the queue.
-  // If we are outside, then we have to request an idle update to flush the queue
+  // If we are inside Core::ProcessEvents(), core will automatically flush the queue.
+  // If we are outside, then we have to request a call to Core::ProcessEvents() on idle.
   if ( false == mImpl->processingEvents )
   {
-    mImpl->renderController.RequestNotificationEventOnIdle();
+    mImpl->renderController.RequestProcessEventsOnIdle();
   }
 
   return mImpl->currentMessageBuffer->ReserveMessageSlot( requestedSize );
@@ -267,10 +274,10 @@ void MessageQueue::ProcessMessages()
 
     // Pass back for use in the event-thread
     mImpl->recycleQueue.push_back( buffer );
-
-    mImpl->sceneUpdate >>= 1;
   }
 
+  mImpl->sceneUpdate >>= 1;
+
   mImpl->queueWasEmpty = mImpl->processQueue.empty(); // Flag whether we processed anything
 
   mImpl->processQueue.clear();