Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017 into lp:widelands

2017-06-16 Thread GunChleoc 
Travis was having problems. I have commented out your last change, because I 
want to see the logs first. I also switched off some macro expansion warnings 
locally and need to see whether it worked - we might go for that one rather 
than blanket disabling.
-- 
https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017/+merge/325717
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/compiler_warnings_062017.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1697242-fileview into lp:widelands

2017-06-16 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 2310. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/243586383.
Appveyor build 2143. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1697242_fileview-2143.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1697242-fileview/+merge/325456
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1697242-fileview.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017 into lp:widelands

2017-06-16 Thread Klaus Halfmann 
plyed this again for quite some time, no problems seen
-- 
https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017/+merge/325717
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/compiler_warnings_062017.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017 into lp:widelands

2017-06-16 Thread Klaus Halfmann 
The internet dod not help to understand that disabled-macro-expansion warning,
but I have seen it for a year now and it did not harm.

And format-pedantic only complains when using a non void* in a printf like 
statement.

Gun: we will need a resubmit for travis to compile this again?
-- 
https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017/+merge/325717
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/compiler_warnings_062017.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-post-b19-2 into lp:widelands

2017-06-16 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 2308. State: errored. Details: 
https://travis-ci.org/widelands/widelands/builds/243585362.
Appveyor build 2142. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_post_b19_2-2142.
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai-post-b19-2/+merge/325796
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/ai-post-b19-2 into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017 into lp:widelands

2017-06-16 Thread Klaus Halfmann 
* Mmmh, looks like the bzr -> git thingy failed,
because .travis.sh definitly is _in_ that branch.

* the gcc fixes did no fix the all fallthrogh / default: warnings for LLVM, sigh

* and yes I still see these:
  src/scripting/lua_map.cc:6053:26: warning: instantiation of function
  'Widelands::MapHollowRegion >::MapHollowRegion' required here, but no definition is available
  [-Wundefined-func-template]
MapHollowRegion> mr(map, har);

What now?
-- 
https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017/+merge/325717
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/compiler_warnings_062017.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_trainingsites_proportion into lp:widelands

2017-06-16 Thread bunnybot 
Refusing to merge, since Travis is not green. Use @bunnybot merge force for 
merging anyways.

Travis build 2306. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/243567535.
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_trainingsites_proportion/+merge/324607
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ai_trainingsites_proportion.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_trainingsites_proportion into lp:widelands

2017-06-16 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 2306. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/243567535.
Appveyor build 2140. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_trainingsites_proportion-2140.
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_trainingsites_proportion/+merge/324607
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ai_trainingsites_proportion.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_trainingsites_proportion into lp:widelands

2017-06-16 Thread GunChleoc 
Thanks for the review :)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_trainingsites_proportion/+merge/324607
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/ai_trainingsites_proportion.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/b19_gcc7 into lp:widelands/build19

2017-06-16 Thread GunChleoc 
GunChleoc has proposed merging lp:~widelands-dev/widelands/b19_gcc7 into 
lp:widelands/build19.

Requested reviews:
  Widelands Developers (widelands-dev)

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

Ported support for gcc7 from trunk.

This can go in as soon as Travis is clean.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/b19_gcc7 into lp:widelands/build19.
=== modified file '.travis.yml'
--- .travis.yml	2016-10-09 09:36:13 +
+++ .travis.yml	2017-06-16 08:32:34 +
@@ -20,25 +20,17 @@
  - compiler: clang
env: CLANG_VERSION="3.5" BUILD_TYPE="Debug"
  - compiler: clang
-   env: CLANG_VERSION="3.6" BUILD_TYPE="Debug"
- - compiler: clang
-   env: CLANG_VERSION="3.7" BUILD_TYPE="Debug"
- - compiler: clang
-   env: CLANG_VERSION="3.8" BUILD_TYPE="Debug"
- - compiler: clang
env: CLANG_VERSION="3.9" BUILD_TYPE="Debug"
  - compiler: clang
+   env: CLANG_VERSION="4.0" BUILD_TYPE="Debug"
+ - compiler: clang
env: CLANG_VERSION="3.4" BUILD_TYPE="Release"
  - compiler: clang
env: CLANG_VERSION="3.5" BUILD_TYPE="Release"
  - compiler: clang
-   env: CLANG_VERSION="3.6" BUILD_TYPE="Release"
- - compiler: clang
-   env: CLANG_VERSION="3.7" BUILD_TYPE="Release"
- - compiler: clang
-   env: CLANG_VERSION="3.8" BUILD_TYPE="Release"
- - compiler: clang
env: CLANG_VERSION="3.9" BUILD_TYPE="Release"
+ - compiler: clang
+   env: CLANG_VERSION="4.0" BUILD_TYPE="Release"
  - compiler: gcc
env: GCC_VERSION="4.7" BUILD_TYPE="Debug"
  - compiler: gcc
@@ -46,16 +38,16 @@
  - compiler: gcc
env: GCC_VERSION="4.9" BUILD_TYPE="Debug"
  - compiler: gcc
-   env: GCC_VERSION="5" BUILD_TYPE="Debug"
- - compiler: gcc
env: GCC_VERSION="6" BUILD_TYPE="Debug"
  - compiler: gcc
+   env: GCC_VERSION="7" BUILD_TYPE="Debug"
+ - compiler: gcc
env: GCC_VERSION="4.7" BUILD_TYPE="Release"
  - compiler: gcc
env: GCC_VERSION="4.8" BUILD_TYPE="Release"
  - compiler: gcc
env: GCC_VERSION="4.9" BUILD_TYPE="Release"
  - compiler: gcc
-   env: GCC_VERSION="5" BUILD_TYPE="Release"
- - compiler: gcc
env: GCC_VERSION="6" BUILD_TYPE="Release"
+ - compiler: gcc
+   env: GCC_VERSION="7" BUILD_TYPE="Release"

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-09-04 07:54:45 +
+++ CMakeLists.txt	2017-06-16 08:32:34 +
@@ -116,7 +116,6 @@
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-padded")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-sign-conversion")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-missing-noreturn")
-  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-implicit-fallthrough")
 
   # TODO(sirver): weak-vtables should be enabled, but leads to lot of errors right now.
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-weak-vtables")
@@ -132,6 +131,9 @@
   if(WIN32)
 # This is needed for getenv().
 wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=gnu++11")
+  else()
+# SDL and MinGW both declare 'unsigned int __builtin_ia32_crc32qi(unsigned int, unsigned char)', resulting in lots of warnings. So, we can't have this flag in Windows.
+wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wredundant-decls")
   endif()
 
   if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8))
@@ -167,7 +169,6 @@
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Woverlength-strings")
   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 "-Wsign-promo")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsync-nand")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wtrampolines")

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-05-17 15:57:06 +
+++ src/CMakeLists.txt	2017-06-16 08:32:34 +
@@ -113,6 +113,7 @@
 logic
 logic_game_controller
 logic_game_settings
+logic_single_player_game_settings
 map_io_map_loader
 network
 profile

=== modified file 'src/base/macros.h'
--- src/base/macros.h	2016-08-04 15:49:05 +
+++ src/base/macros.h	2017-06-16 08:32:34 +
@@ -67,6 +67,16 @@
 #define DIAG_OFF(x) GCC_DIAG_OFF(x) CLANG_DIAG_OFF(x)
 #define DIAG_ON(x) GCC_DIAG_ON(x) CLANG_DIAG_ON(x)
 
+// For switch statements: Tell gcc7 and clang that a fallthrough is intended
+// https://developers.redhat.com/blog/2017/03/10/wimplicit-fallthrough-in-gcc-7/
+#ifdef __clang__
+#define FALLS_THROUGH /* Falls through */ [[clang::fallthrough]]
+#elif __GNUC__ >= 7
+#define FALLS_THROUGH /* Falls through */ [[gnu::fallthrough]]
+#else
+#define FALLS_THROUGH /* Falls through */
+#endif
+
 // disallow copying or assigning a class
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
 	TypeName(const TypeName&) = delete;

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/b19_gcc7 into lp:widelands/build19

2017-06-16 Thread GunChleoc 
The proposal to merge lp:~widelands-dev/widelands/b19_gcc7 into 
lp:widelands/build19 has been updated.

Description changed to:

Ported support for gcc7 from trunk.

This can go in as soon as Travis is clean.

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

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017 into lp:widelands

2017-06-16 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 2304. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/243539525.
Appveyor build 2132. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_compiler_warnings_062017-2132.
-- 
https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017/+merge/325717
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/compiler_warnings_062017.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp