Fix variable shadowing

-Werror=shadow added.

Requies:
 - https://review.tizen.org/gerrit/c/platform/core/base/bundle/+/324305

Change-Id: I1642841b1b3499e1b23c521661286f89cfc60fb7
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73c1a2075dbc27a35c1c2a2d744918c70b517b04..fca33a860f19f2dc2bdcbba9b7d655ed0a87bddd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 
 ## Compiler flags
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Werror -ffunction-sections -fdata-sections -fmerge-all-constants -fPIE -fPIC")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Werror -Werror=shadow -ffunction-sections -fdata-sections -fmerge-all-constants -fPIE -fPIC")
 
 ## Linker flags
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed,--gc-sections -pie")

diff --git a/src/api/connector.cc b/src/api/connector.cc
index ba02dc48aa53a3d3ea4fb3452b8d85d793bf16c3..5498921b409b42a7302343e8f521d0f276288a88 100644 (file)
--- a/src/api/connector.cc
+++ b/src/api/connector.cc
@@ -143,8 +143,8 @@ void Connector::UnregisterUserCallback(int execution_id) {
 void Connector::InvokeUserCallback(int execution_id,
     const std::string& result) {
   auto it = std::find_if(user_callbacks_.begin(), user_callbacks_.end(),
-      [&execution_id](auto&& it) {
-        return std::get<0>(it) == execution_id;
+      [&execution_id](auto&& callbacks_it) {
+        return std::get<0>(callbacks_it) == execution_id;
       });
   if (it == user_callbacks_.end()) {
     LOG(ERROR) << "No callback found for execution id: " << execution_id;

diff --git a/src/plugin-daemon/plugin_sample_so.cc b/src/plugin-daemon/plugin_sample_so.cc
index b26c082d6b365d682e3431b62553f996e8f79254..e7929440e6a8889bfb702bd0e67aa752cc244cec 100644 (file)
--- a/src/plugin-daemon/plugin_sample_so.cc
+++ b/src/plugin-daemon/plugin_sample_so.cc
@@ -67,9 +67,9 @@ API const char* PLUGIN_EXECUTE(const char* action_model_json) {
     LOG(INFO) << "param1: " << param1 << ", param2: " << param2;
     result.set("result", "success");
   } catch (const std::runtime_error& e) {
-    common::SafeJson result("{}");
-    result.set("error", e.what());
-    return strdup(result.stringify().c_str());
+    common::SafeJson error_result("{}");
+    error_result.set("error", e.what());
+    return strdup(error_result.stringify().c_str());
   }
 
   return strdup(result.stringify().c_str());