From 00554b9deea0386370e20bc6beaecad17978ed73 Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Tue, 2 Dec 2014 17:57:26 +0000 Subject: [PATCH] Change keep running reasons to enum from exported symbols to avoid external symbol lookup Change-Id: I6cd0375a6e6b117311fc0df2ba8a00afd0559870 --- dali/integration-api/core.cpp | 16 ---------------- dali/integration-api/core.h | 23 ++++++++++++----------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/dali/integration-api/core.cpp b/dali/integration-api/core.cpp index 44a4323..45e2be5 100644 --- a/dali/integration-api/core.cpp +++ b/dali/integration-api/core.cpp @@ -34,22 +34,6 @@ namespace Dali namespace Integration { -namespace KeepUpdating -{ - -const unsigned int NOT_REQUESTED = 0x00; ///< Zero means that no further updates are required - -// Bit-field values -const unsigned int STAGE_KEEP_RENDERING = 0x01; ///< Stage::KeepRendering() is being used -const unsigned int INCOMING_MESSAGES = 0x02; ///< Event-thread is sending messages to update-thread -const unsigned int ANIMATIONS_RUNNING = 0x04; ///< Animations are ongoing -const unsigned int DYNAMICS_CHANGED = 0x08; ///< A dynamics simulation is running -const unsigned int LOADING_RESOURCES = 0x10; ///< Resources are being loaded -const unsigned int MONITORING_PERFORMANCE = 0x20; ///< The --enable-performance-monitor option is being used -const unsigned int RENDER_TASK_SYNC = 0x40; ///< The refresh once render task is waiting for render sync - -} // namespace KeepUpdating - Core* Core::New(RenderController& renderController, PlatformAbstraction& platformAbstraction, GlAbstraction& glAbstraction, GlSyncAbstraction& glSyncAbstraction, GestureManager& gestureManager, ResourcePolicy::DataRetention policy ) { diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h index 2a2fbb0..9645475 100644 --- a/dali/integration-api/core.h +++ b/dali/integration-api/core.h @@ -49,19 +49,20 @@ struct TouchData; /** * The reasons why further updates are required. */ -namespace KeepUpdating DALI_IMPORT_API +namespace KeepUpdating { - extern const unsigned int NOT_REQUESTED; ///< Zero means that no further updates are required - - // Bit-field values - extern const unsigned int STAGE_KEEP_RENDERING; ///< 0x01 - Stage::KeepRendering() is being used - extern const unsigned int INCOMING_MESSAGES; ///< 0x02 - Event-thread is sending messages to update-thread - extern const unsigned int ANIMATIONS_RUNNING; ///< 0x04 - Animations are ongoing - extern const unsigned int DYNAMICS_CHANGED; ///< 0x08 - A dynamics simulation is running - extern const unsigned int LOADING_RESOURCES; ///< 0x10 - Resources are being loaded - extern const unsigned int MONITORING_PERFORMANCE; ///< 0x20 - The --enable-performance-monitor option is being used - extern const unsigned int RENDER_TASK_SYNC; ///< 0x40 - A render task is waiting for render sync +enum Reasons +{ + NOT_REQUESTED = 0x00, ///< Zero means that no further updates are required + STAGE_KEEP_RENDERING = 0x01, ///< - Stage::KeepRendering() is being used + INCOMING_MESSAGES = 0x02, ///< - Event-thread is sending messages to update-thread + ANIMATIONS_RUNNING = 0x04, ///< - Animations are ongoing + DYNAMICS_CHANGED = 0x08, ///< - A dynamics simulation is running + LOADING_RESOURCES = 0x10, ///< - Resources are being loaded + MONITORING_PERFORMANCE = 0x20, ///< - The --enable-performance-monitor option is being used + RENDER_TASK_SYNC = 0x40 ///< - A render task is waiting for render sync }; +} /** * The status of the Core::Update operation. -- 2.7.4