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/wlapplication_options.cc (+1/-1)
src/wui/constructionsitewindow.cc (+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: mp+372109@code.launchpad.net

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: https://travis-ci.org/widelands/widelands/builds/579080055.
Appveyor build 5135. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_compiler_warnings_201908-5135.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/wlapplication_options.cc'
2--- src/wlapplication_options.cc 2019-08-28 06:12:07 +0000
3+++ src/wlapplication_options.cc 2019-08-31 03:27:07 +0000
4@@ -25,7 +25,7 @@
5 #include "logic/filesystem_constants.h"
6 #include "wlapplication.h"
7
8-Profile g_options(Profile::err_log);
9+static Profile g_options(Profile::err_log);
10
11 void check_config_used() {
12 g_options.check_used();
13
14=== modified file 'src/wui/constructionsitewindow.cc'
15--- src/wui/constructionsitewindow.cc 2019-07-11 08:38:29 +0000
16+++ src/wui/constructionsitewindow.cc 2019-08-31 03:27:07 +0000
17@@ -30,10 +30,6 @@
18 static const char pic_tab_settings[] = "images/wui/menus/statistics_stock.png";
19 static const char pic_tab_settings_wares[] = "images/wui/stats/menu_tab_wares_warehouse.png";
20 static const char pic_tab_settings_workers[] = "images/wui/stats/menu_tab_workers_warehouse.png";
21-static const char pic_max_fill_indicator[] = "images/wui/buildings/max_fill_indicator.png";
22-static const char pic_priority_low[] = "images/wui/buildings/low_priority_button.png";
23-static const char pic_priority_normal[] = "images/wui/buildings/normal_priority_button.png";
24-static const char pic_priority_high[] = "images/wui/buildings/high_priority_button.png";
25 static const char pic_stock_policy_prefer[] = "images/wui/buildings/stock_policy_prefer.png";
26 static const char pic_stock_policy_dontstock[] = "images/wui/buildings/stock_policy_dontstock.png";
27 static const char pic_stock_policy_remove[] = "images/wui/buildings/stock_policy_remove.png";

Subscribers

People subscribed via source and target branches

to status/vote changes: