From: Andrew Cox Date: Thu, 19 Feb 2015 00:02:24 +0000 (+0000) Subject: Include a few places to compensate for core inclusion cleanup X-Git-Tag: dali_1.0.31~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5964f0b0b6a8ae5c636d022973043263d9ebea7;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Include a few places to compensate for core inclusion cleanup Follows core patch: https://review.tizen.org/gerrit/#/c/35596 Change-Id: I35a858313aa404c36c9f9479ae4ed715cc461a6d Signed-off-by: Andrew Cox --- diff --git a/adaptors/base/performance-logging/statistics/stat-context.cpp b/adaptors/base/performance-logging/statistics/stat-context.cpp index 468cb28..7197322 100644 --- a/adaptors/base/performance-logging/statistics/stat-context.cpp +++ b/adaptors/base/performance-logging/statistics/stat-context.cpp @@ -22,6 +22,9 @@ // INTERNAL INCLUDES #include +// EXTERNAL INCLUDES +#include + namespace Dali { diff --git a/adaptors/base/performance-logging/statistics/stat-context.h b/adaptors/base/performance-logging/statistics/stat-context.h index 2e96b9f..2f241d9 100644 --- a/adaptors/base/performance-logging/statistics/stat-context.h +++ b/adaptors/base/performance-logging/statistics/stat-context.h @@ -24,6 +24,8 @@ #include #include +// EXTERNAL INCLUDES +#include namespace Dali { diff --git a/adaptors/base/update-thread.cpp b/adaptors/base/update-thread.cpp index b1b1112..8247a69 100644 --- a/adaptors/base/update-thread.cpp +++ b/adaptors/base/update-thread.cpp @@ -18,15 +18,16 @@ // CLASS HEADER #include "update-thread.h" -// EXTERNAL INCLUDES -#include - // INTERNAL INCLUDES #include #include #include #include +// EXTERNAL INCLUDES +#include +#include + namespace Dali { diff --git a/platform-abstractions/slp/data-cache/data-cache-impl.cpp b/platform-abstractions/slp/data-cache/data-cache-impl.cpp index bee00b3..b3d22ac 100644 --- a/platform-abstractions/slp/data-cache/data-cache-impl.cpp +++ b/platform-abstractions/slp/data-cache/data-cache-impl.cpp @@ -27,6 +27,7 @@ // EXTERNAL INCLUDES #include #include +#include namespace Dali { diff --git a/platform-abstractions/slp/image-loaders/loader-bmp.cpp b/platform-abstractions/slp/image-loaders/loader-bmp.cpp index caa8a19..66df868 100644 --- a/platform-abstractions/slp/image-loaders/loader-bmp.cpp +++ b/platform-abstractions/slp/image-loaders/loader-bmp.cpp @@ -22,6 +22,8 @@ #include #include +#include + namespace Dali { using Integration::Bitmap; diff --git a/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp b/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp index 942e054..22cfec1 100644 --- a/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp +++ b/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp @@ -18,12 +18,6 @@ // Class header #include "assimp-model-builder.h" -// External headers -#include -#include -#include -#include // Post processing flags - // Core headers #include #include @@ -34,15 +28,20 @@ #include #include #include - #include - #include // Local headers #include "assimp-proxy.h" #include "left-hand-convertor.h" +// External headers +#include +#include +#include +#include // Post processing flags +#include + namespace Dali { namespace SlpPlatform diff --git a/platform-abstractions/slp/slp-logging.cpp b/platform-abstractions/slp/slp-logging.cpp index d47919f..dc54e0d 100644 --- a/platform-abstractions/slp/slp-logging.cpp +++ b/platform-abstractions/slp/slp-logging.cpp @@ -21,7 +21,9 @@ // EXTERNAL INCLUDES #ifndef DALI_PROFILE_UBUNTU #include -#endif // DALI_PROFILE_UBUNTU +#else // DALI_PROFILE_UBUNTU +#include +#endif namespace Dali {