From 92268e1b9d79d2099aeabee06e87a5ba78ea7db7 Mon Sep 17 00:00:00 2001
From: Francisco Santos <f1.santos@samsung.com>
Date: Wed, 1 Jul 2015 15:05:57 +0100
Subject: [PATCH] Fix issues and added Wextra flag.

Change-Id: Ifcdf9f7620ed4b19d80482beeb100fb4e28c5685
---
 build/tizen/dali-core/Makefile.am         | 6 ++++--
 dali/public-api/object/property-types.cpp | 2 +-
 dali/public-api/object/property-types.h   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/tizen/dali-core/Makefile.am b/build/tizen/dali-core/Makefile.am
index e5023b6..f17d918 100644
--- a/build/tizen/dali-core/Makefile.am
+++ b/build/tizen/dali-core/Makefile.am
@@ -58,11 +58,13 @@ dali-shaders.cpp: $(dali_shaders_script) $(dali_shaders_dir)/*.txt
 dali_core_includes = \
         -I../../..
 
+cxx_flags = -Werror -Wall -Wextra -Wno-unused-parameter -Wfloat-equal
+
 libdali_core_la_CXXFLAGS = -DDALI_COMPILATION \
                            -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \
                            -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \
                            -DDALI_EMOTICON_DIR="\"${emoticons_dir}\"" \
-                           -Werror -Wall -Wfloat-equal \
+                           $(cxx_flags) \
                            $(dali_core_includes) \
                            $(DALI_CFLAGS)
 
@@ -152,7 +154,7 @@ linker_test_SOURCES = linker-test.cpp  \
     ../../../automated-tests/src/dali/dali-test-suite-utils/test-dynamics.cpp
 
 linker_test_CXXFLAGS = \
-  -Werror -Wall -Wfloat-equal \
+  $(cxx_flags) \
   -I../../../automated-tests/src/dali/dali-test-suite-utils \
   $(dali_core_includes) \
   $(DALI_CFLAGS)
diff --git a/dali/public-api/object/property-types.cpp b/dali/public-api/object/property-types.cpp
index 8ca60a9..581acb2 100644
--- a/dali/public-api/object/property-types.cpp
+++ b/dali/public-api/object/property-types.cpp
@@ -48,7 +48,7 @@ namespace PropertyTypes
 {
 
 DALI_EXPORT_API
-const char* const GetName(Property::Type type)
+const char* GetName(Property::Type type)
 {
   if (type < PROPERTY_TYPE_NAMES_COUNT )
   {
diff --git a/dali/public-api/object/property-types.h b/dali/public-api/object/property-types.h
index c12c29e..f6409ee 100644
--- a/dali/public-api/object/property-types.h
+++ b/dali/public-api/object/property-types.h
@@ -46,7 +46,7 @@ namespace PropertyTypes
  * @param [in] type The property type.
  * @return The name of this type.
  */
-DALI_IMPORT_API const char* const GetName(Property::Type type);
+DALI_IMPORT_API const char* GetName(Property::Type type);
 
 /**
  * @brief Retrieve an enumerated property type.
-- 
2.7.4