From 457bba0150a9fb5a998ddf0fce93425d14feac5f Mon Sep 17 00:00:00 2001
From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 16 Sep 2014 10:00:45 +0100
Subject: [PATCH] (Automated Tests) Fix compiler warnings in some test cases

Change-Id: I91eb66e9a01c39951b80341f73e71cc185da86af
---
 .../utc-Dali-CommandLineOptions.cpp                    | 18 ++++++------------
 .../src/dali-adaptor-internal/utc-Dali-TiltSensor.cpp  |  4 ++--
 automated-tests/src/dali-adaptor/utc-Dali-Timer.cpp    |  3 ++-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/automated-tests/src/dali-adaptor-internal/utc-Dali-CommandLineOptions.cpp b/automated-tests/src/dali-adaptor-internal/utc-Dali-CommandLineOptions.cpp
index d0e6339..4531017 100644
--- a/automated-tests/src/dali-adaptor-internal/utc-Dali-CommandLineOptions.cpp
+++ b/automated-tests/src/dali-adaptor-internal/utc-Dali-CommandLineOptions.cpp
@@ -40,12 +40,6 @@ void command_line_options_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-namespace
-{
-int gOriginalOptIndValue(0);
-}
-
-
 int UtcDaliCommandLineOptionsNoArgs(void)
 {
   optind=1;
@@ -186,7 +180,7 @@ int UtcDaliCommandLineOptionsMixture(void)
 {
   optind = 1; // Reset opt for test
 
-  char* argList[] =
+  const char* argList[] =
   {
     "program",
     "--width=800",
@@ -196,7 +190,7 @@ int UtcDaliCommandLineOptionsMixture(void)
     "-r",
   };
   int argc( sizeof( argList ) / sizeof( argList[0] ) );
-  char** argv = argList;
+  char** argv = const_cast<char**>( argList );
 
   CommandLineOptions options( &argc, &argv );
 
@@ -217,7 +211,7 @@ int UtcDaliCommandLineOptionsMixtureDaliOpsAtStart(void)
 {
   optind=1;
 
-  char* argList[] =
+  const char* argList[] =
   {
       "program",
       "--width=800",
@@ -227,7 +221,7 @@ int UtcDaliCommandLineOptionsMixtureDaliOpsAtStart(void)
       "-y", "600",
   };
   int argc( sizeof( argList ) / sizeof( argList[0] ) );
-  char** argv = argList;
+  char** argv = const_cast<char**>( argList );
 
   CommandLineOptions options( &argc, &argv );
 
@@ -248,7 +242,7 @@ int UtcDaliCommandLineOptionsMixtureDaliOpsAtEnd(void)
 {
   optind=1;
 
-  char* argList[] =
+  const char* argList[] =
   {
       "program",
       "hello-world",
@@ -258,7 +252,7 @@ int UtcDaliCommandLineOptionsMixtureDaliOpsAtEnd(void)
       "--height", "1000",
   };
   int argc( sizeof( argList ) / sizeof( argList[0] ) );
-  char** argv = argList;
+  char** argv = const_cast<char**>( argList );
 
   CommandLineOptions options( &argc, &argv );
 
diff --git a/automated-tests/src/dali-adaptor-internal/utc-Dali-TiltSensor.cpp b/automated-tests/src/dali-adaptor-internal/utc-Dali-TiltSensor.cpp
index 8461789..d364d46 100644
--- a/automated-tests/src/dali-adaptor-internal/utc-Dali-TiltSensor.cpp
+++ b/automated-tests/src/dali-adaptor-internal/utc-Dali-TiltSensor.cpp
@@ -18,6 +18,7 @@
 #include <iostream>
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <Ecore.h>
 #include <dali/dali.h>
 #include <dali-test-suite-utils.h>
@@ -74,8 +75,7 @@ TiltSensor GetTiltSensor()
 bool ecore_timer_running = false;
 Ecore_Task_Cb timer_callback_func=NULL;
 const void* timer_callback_data=NULL;
-bool main_loop_can_run = false;
-int timerId = 8;
+intptr_t timerId = 8; // intptr_t has the same size as a pointer and is platform independent so this can be returned as a pointer in ecore_timer_add below without compilation warnings
 }// anon namespace
 extern "C"
 {
diff --git a/automated-tests/src/dali-adaptor/utc-Dali-Timer.cpp b/automated-tests/src/dali-adaptor/utc-Dali-Timer.cpp
index 2f4e48e..4a57090 100644
--- a/automated-tests/src/dali-adaptor/utc-Dali-Timer.cpp
+++ b/automated-tests/src/dali-adaptor/utc-Dali-Timer.cpp
@@ -17,6 +17,7 @@
 
 #include <iostream>
 #include <stdlib.h>
+#include <stdint.h>
 #include <dali/dali.h>
 #include <Ecore.h>
 #include <dali-test-suite-utils.h>
@@ -39,7 +40,7 @@ bool ecore_timer_running = false;
 Ecore_Task_Cb timer_callback_func=NULL;
 const void* timer_callback_data=NULL;
 bool main_loop_can_run = false;
-int timerId = 0;
+intptr_t timerId = 0; // intptr_t has the same size as a pointer and is platform independent so this can be returned as a pointer in ecore_timer_add below without compilation warnings
 }// anon namespace
 
 extern "C"
-- 
2.7.4