widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

SirVer has proposed merging lp:~widelands-dev/widelands/error_shadow into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/error_shadow/+merge/282225

I introduced a couple of warnings in my recent branches that are only there for GCC. With the recent travis changes and turning them into errors, bunnybot/travis will catch these in the future once this branch is merged.

I am awaiting bunnybots reply and see if there are currently errors in code.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/error_shadow into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-05 10:35:13 +0000
+++ CMakeLists.txt	2016-01-11 20:22:14 +0000
@@ -157,7 +157,6 @@
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpacked")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpointer-arith")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wredundant-decls")
-  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wshadow")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsign-promo")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wswitch-default")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsync-nand")
@@ -170,6 +169,7 @@
 # Turn some warnings into errors.
 wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
 wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
+wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
 
 
 IF (WIN32)