GunChleoc has proposed merging
lp:~widelands-dev/widelands/compiler-warnings-201908 into lp:widelands.
Commit message:
Fix compiler warnings.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/compiler-warnings-201908/+merge/372109
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/compiler-warnings-201908 into lp:widelands.
=== modified file 'src/wlapplication_options.cc'
--- src/wlapplication_options.cc 2019-08-28 06:12:07 +0000
+++ src/wlapplication_options.cc 2019-08-31 03:27:07 +0000
@@ -25,7 +25,7 @@
#include "logic/filesystem_constants.h"
#include "wlapplication.h"
-Profile g_options(Profile::err_log);
+static Profile g_options(Profile::err_log);
void check_config_used() {
g_options.check_used();
=== modified file 'src/wui/constructionsitewindow.cc'
--- src/wui/constructionsitewindow.cc 2019-07-11 08:38:29 +0000
+++ src/wui/constructionsitewindow.cc 2019-08-31 03:27:07 +0000
@@ -30,10 +30,6 @@
static const char pic_tab_settings[] = "images/wui/menus/statistics_stock.png";
static const char pic_tab_settings_wares[] = "images/wui/stats/menu_tab_wares_warehouse.png";
static const char pic_tab_settings_workers[] = "images/wui/stats/menu_tab_workers_warehouse.png";
-static const char pic_max_fill_indicator[] = "images/wui/buildings/max_fill_indicator.png";
-static const char pic_priority_low[] = "images/wui/buildings/low_priority_button.png";
-static const char pic_priority_normal[] = "images/wui/buildings/normal_priority_button.png";
-static const char pic_priority_high[] = "images/wui/buildings/high_priority_button.png";
static const char pic_stock_policy_prefer[] = "images/wui/buildings/stock_policy_prefer.png";
static const char pic_stock_policy_dontstock[] = "images/wui/buildings/stock_policy_dontstock.png";
static const char pic_stock_policy_remove[] = "images/wui/buildings/stock_policy_remove.png";
_______________________________________________
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
