X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fadaptor%2Fcommon%2Fcombined-update-render-controller-debug.h;h=ca52e2538e5a2a0f563da38b412c8f77dd274283;hb=240762c32ee5c8584b3a128ca775188a9b1c0cf4;hp=41b9162d95ca6b7046da603a7ed2aa3b62dba6d3;hpb=454e03e2413be60a42ae4bdd2976b0e1d6a20945;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/adaptor/common/combined-update-render-controller-debug.h b/dali/internal/adaptor/common/combined-update-render-controller-debug.h
old mode 100644
new mode 100755
index 41b9162..ca52e25
--- a/dali/internal/adaptor/common/combined-update-render-controller-debug.h
+++ b/dali/internal/adaptor/common/combined-update-render-controller-debug.h
@@ -48,16 +48,16 @@ namespace
 
 Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_THREAD_SYNC" );
 
-#define LOG_THREAD_SYNC(level, color, format, args...) \
-  DALI_LOG_INFO( gLogFilter, level, "%s" format "%s\n", color, ## args, COLOR_CLEAR )
+#define LOG_THREAD_SYNC(level, color, format, ...) \
+  DALI_LOG_INFO( gLogFilter, level, "%s" format "%s\n", color, ## __VA_ARGS__, COLOR_CLEAR )
 
 #define LOG_THREAD_SYNC_TRACE(color) \
   Dali::Integration::Log::TraceObj debugTraceObj( gLogFilter, "%s%s%s", color, __FUNCTION__, COLOR_CLEAR ); \
   if( ! gLogFilter->IsTraceEnabled() ) { LOG_THREAD_SYNC( Debug::Concise, color, "%s", __FUNCTION__ ); }
 
-#define LOG_THREAD_SYNC_TRACE_FMT(color, format, args...) \
-  Dali::Integration::Log::TraceObj debugTraceObj( gLogFilter, "%s%s: " format "%s", color, __FUNCTION__, ## args, COLOR_CLEAR ); \
-  if( ! gLogFilter->IsTraceEnabled() ) { LOG_THREAD_SYNC( Debug::Concise, color, "%s: " format, __FUNCTION__, ## args ); }
+#define LOG_THREAD_SYNC_TRACE_FMT(color, format, ...) \
+  Dali::Integration::Log::TraceObj debugTraceObj( gLogFilter, "%s%s: " format "%s", color, __FUNCTION__, ## __VA_ARGS__, COLOR_CLEAR ); \
+  if( ! gLogFilter->IsTraceEnabled() ) { LOG_THREAD_SYNC( Debug::Concise, color, "%s: " format, __FUNCTION__, ## __VA_ARGS__ ); }
 
 #elif defined( RELEASE_BUILD_LOGGING )
 
@@ -70,20 +70,20 @@ Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_TH
 #define DEBUG_LEVEL_UPDATE_RENDER      0
 #define DEBUG_LEVEL_EVENT       0
 
-#define LOG_THREAD_SYNC(level, color, format, args...) \
-  Dali::Integration::Log::LogMessage( Dali::Integration::Log::DebugInfo, "%s" format "%s\n", color, ## args, COLOR_CLEAR )
+#define LOG_THREAD_SYNC(level, color, format, ...) \
+  Dali::Integration::Log::LogMessage( Dali::Integration::Log::DebugInfo, "%s" format "%s\n", color, ## __VA_ARGS__, COLOR_CLEAR )
 
 #define LOG_THREAD_SYNC_TRACE(color) \
   Dali::Integration::Log::LogMessage( Dali::Integration::Log::DebugInfo, "%s%s%s\n", color, __FUNCTION__, COLOR_CLEAR )
 
-#define LOG_THREAD_SYNC_TRACE_FMT(color, format, args...) \
-  Dali::Integration::Log::LogMessage( Dali::Integration::Log::DebugInfo, "%s%s: " format "%s\n", color, __FUNCTION__, ## args, COLOR_CLEAR )
+#define LOG_THREAD_SYNC_TRACE_FMT(color, format, ...) \
+  Dali::Integration::Log::LogMessage( Dali::Integration::Log::DebugInfo, "%s%s: " format "%s\n", color, __FUNCTION__, ## __VA_ARGS__, COLOR_CLEAR )
 
 #else
 
-#define LOG_THREAD_SYNC(level, color, format, args...)
+#define LOG_THREAD_SYNC(level, color, format, ...)
 #define LOG_THREAD_SYNC_TRACE(color)
-#define LOG_THREAD_SYNC_TRACE_FMT(color, format, args...)
+#define LOG_THREAD_SYNC_TRACE_FMT(color, format, ...)
 
 #endif // DEBUG_ENABLED
 
@@ -102,31 +102,31 @@ Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_TH
 #endif
 
 #ifdef ENABLE_COUNTER_LOGGING
-#define LOG_COUNTER_EVENT(format, args...)            LOG_THREAD_SYNC(DEBUG_LEVEL_COUNTER, COLOR_LIGHT_RED, "%s: " format, __FUNCTION__, ## args)
-#define LOG_COUNTER_UPDATE_RENDER(format, args...)    LOG_THREAD_SYNC(DEBUG_LEVEL_COUNTER, COLOR_LIGHT_YELLOW, "%s: " format, __FUNCTION__, ## args)
+#define LOG_COUNTER_EVENT(format, ...)            LOG_THREAD_SYNC(DEBUG_LEVEL_COUNTER, COLOR_LIGHT_RED, "%s: " format, __FUNCTION__, ## __VA_ARGS__)
+#define LOG_COUNTER_UPDATE_RENDER(format, ...)    LOG_THREAD_SYNC(DEBUG_LEVEL_COUNTER, COLOR_LIGHT_YELLOW, "%s: " format, __FUNCTION__, ## __VA_ARGS__)
 #else
-#define LOG_COUNTER_EVENT(format, args...)
-#define LOG_COUNTER_UPDATE_RENDER(format, args...)
+#define LOG_COUNTER_EVENT(format, ...)
+#define LOG_COUNTER_UPDATE_RENDER(format, ...)
 #endif
 
 #ifdef ENABLE_UPDATE_RENDER_THREAD_LOGGING
-#define LOG_UPDATE_RENDER(format, args...)            LOG_THREAD_SYNC(DEBUG_LEVEL_UPDATE_RENDER, COLOR_YELLOW, "%s: " format, __FUNCTION__, ## args)
+#define LOG_UPDATE_RENDER(format, ...)            LOG_THREAD_SYNC(DEBUG_LEVEL_UPDATE_RENDER, COLOR_YELLOW, "%s: " format, __FUNCTION__, ## __VA_ARGS__)
 #define LOG_UPDATE_RENDER_TRACE                       LOG_THREAD_SYNC_TRACE(COLOR_YELLOW)
-#define LOG_UPDATE_RENDER_TRACE_FMT(format, args...)  LOG_THREAD_SYNC_TRACE_FMT(COLOR_YELLOW, format, ## args)
+#define LOG_UPDATE_RENDER_TRACE_FMT(format, ...)  LOG_THREAD_SYNC_TRACE_FMT(COLOR_YELLOW, format, ## __VA_ARGS__)
 #else
-#define LOG_UPDATE_RENDER(format, args...)
+#define LOG_UPDATE_RENDER(format, ...)
 #define LOG_UPDATE_RENDER_TRACE
-#define LOG_UPDATE_RENDER_TRACE_FMT(format, args...)
+#define LOG_UPDATE_RENDER_TRACE_FMT(format, ...)
 #endif
 
 #ifdef ENABLE_EVENT_LOGGING
-#define LOG_EVENT(format, args...)             LOG_THREAD_SYNC(DEBUG_LEVEL_EVENT, COLOR_WHITE, "%s: " format, __FUNCTION__, ## args)
+#define LOG_EVENT(format, ...)             LOG_THREAD_SYNC(DEBUG_LEVEL_EVENT, COLOR_WHITE, "%s: " format, __FUNCTION__, ## __VA_ARGS__)
 #define LOG_EVENT_TRACE                        LOG_THREAD_SYNC_TRACE(COLOR_WHITE)
-#define LOG_EVENT_TRACE_FMT(format, args...)   LOG_THREAD_SYNC_TRACE_FMT(COLOR_WHITE, format, ## args)
+#define LOG_EVENT_TRACE_FMT(format, ...)   LOG_THREAD_SYNC_TRACE_FMT(COLOR_WHITE, format, ## __VA_ARGS__)
 #else
-#define LOG_EVENT(format, args...)
+#define LOG_EVENT(format, ...)
 #define LOG_EVENT_TRACE
-#define LOG_EVENT_TRACE_FMT(format, args...)
+#define LOG_EVENT_TRACE_FMT(format, ...)
 #endif
 
 } // unnamed namespace