widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

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

Commit message:
Use -Werror=deprecated for clang compiles, so that we catch newly introduced ones earlier on travis. Also, fixes the one error this triggered.



Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/deprecated_error/+merge/288337
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/deprecated_error into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-08 14:16:35 +0000
+++ CMakeLists.txt	2016-03-07 19:27:45 +0000
@@ -119,6 +119,7 @@
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-unreachable-code")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-documentation")
 
+  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=non-pod-varargs")
 
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Qunused-arguments")

=== modified file 'src/editor/ui_menus/editor_help.h'
--- src/editor/ui_menus/editor_help.h	2016-02-10 14:46:32 +0000
+++ src/editor/ui_menus/editor_help.h	2016-03-07 19:27:45 +0000
@@ -45,9 +45,6 @@
 			kTree
 		};
 
-		HelpEntry(const HelpEntry& other) : HelpEntry(other.index, other.descname, other.icon) {
-		}
-
 		HelpEntry(const Widelands::DescriptionIndex init_index,
 					 const std::string& init_descname,
 					 const Image* init_icon)