Merge lp:~widelands-dev/widelands/compiler-warnings-201908 into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 9191
Proposed branch: lp:~widelands-dev/widelands/compiler-warnings-201908
Merge into: lp:widelands
Diff against target: 27 lines (+1/-5)
2 files modified
src/ (+1/-1)
src/wui/ (+0/-4)
To merge this branch: bzr merge lp:~widelands-dev/widelands/compiler-warnings-201908
Reviewer Review Type Date Requested Status
Klaus Halfmann Approve
Review via email:

Commit message

Fix compiler warnings.

To post a comment you must log in.
Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Nothing to really check here.
I will it compile it anyway

review: Approve (code review)
Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Compiled withouth any noteworthy complaints

@bunnybot merge

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks for the review!

I'll be going through the Travis/Appveyor logs to see if I can find more stuff to fix.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5365. State: passed. Details:
Appveyor build 5135. State: success. Details:

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/'
--- src/ 2019-08-28 06:12:07 +0000
+++ src/ 2019-08-31 03:27:07 +0000
@@ -25,7 +25,7 @@
25#include "logic/filesystem_constants.h"25#include "logic/filesystem_constants.h"
26#include "wlapplication.h"26#include "wlapplication.h"
28Profile g_options(Profile::err_log);28static Profile g_options(Profile::err_log);
30void check_config_used() {30void check_config_used() {
31 g_options.check_used();31 g_options.check_used();
=== modified file 'src/wui/'
--- src/wui/ 2019-07-11 08:38:29 +0000
+++ src/wui/ 2019-08-31 03:27:07 +0000
@@ -30,10 +30,6 @@
30static const char pic_tab_settings[] = "images/wui/menus/statistics_stock.png";30static const char pic_tab_settings[] = "images/wui/menus/statistics_stock.png";
31static const char pic_tab_settings_wares[] = "images/wui/stats/menu_tab_wares_warehouse.png";31static const char pic_tab_settings_wares[] = "images/wui/stats/menu_tab_wares_warehouse.png";
32static const char pic_tab_settings_workers[] = "images/wui/stats/menu_tab_workers_warehouse.png";32static const char pic_tab_settings_workers[] = "images/wui/stats/menu_tab_workers_warehouse.png";
33static const char pic_max_fill_indicator[] = "images/wui/buildings/max_fill_indicator.png";
34static const char pic_priority_low[] = "images/wui/buildings/low_priority_button.png";
35static const char pic_priority_normal[] = "images/wui/buildings/normal_priority_button.png";
36static const char pic_priority_high[] = "images/wui/buildings/high_priority_button.png";
37static const char pic_stock_policy_prefer[] = "images/wui/buildings/stock_policy_prefer.png";33static const char pic_stock_policy_prefer[] = "images/wui/buildings/stock_policy_prefer.png";
38static const char pic_stock_policy_dontstock[] = "images/wui/buildings/stock_policy_dontstock.png";34static const char pic_stock_policy_dontstock[] = "images/wui/buildings/stock_policy_dontstock.png";
39static const char pic_stock_policy_remove[] = "images/wui/buildings/stock_policy_remove.png";35static const char pic_stock_policy_remove[] = "images/wui/buildings/stock_policy_remove.png";


People subscribed via source and target branches

to status/vote changes: