From 4347fb0be75856872c4b8a88e1122d628813218f Mon Sep 17 00:00:00 2001 From: JapaMala Date: Thu, 18 Apr 2019 23:30:03 -0500 Subject: [PATCH] Use size_t for vector size comparisons. --- plugins/remotefortressreader/dwarf_control.cpp | 6 +++--- plugins/remotefortressreader/remotefortressreader.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/remotefortressreader/dwarf_control.cpp b/plugins/remotefortressreader/dwarf_control.cpp index 57c770301..98b51175f 100644 --- a/plugins/remotefortressreader/dwarf_control.cpp +++ b/plugins/remotefortressreader/dwarf_control.cpp @@ -235,7 +235,7 @@ void CopyBuildMenu(DwarfControl::SidebarState * out) auto menus = df::global::ui_sidebar_menus; auto build_selector = df::global::ui_build_selector; if (build_selector->building_type == -1) - for (int i = 0; i < menus->building.choices_visible.size(); i++) + for (size_t i = 0; i < menus->building.choices_visible.size(); i++) { auto menu_item = menus->building.choices_visible[i]; auto send_item = out->add_menu_items(); @@ -262,12 +262,12 @@ void CopyBuildMenu(DwarfControl::SidebarState * out) send_bld->set_building_subtype(build_selector->building_subtype); send_bld->set_building_custom(build_selector->custom_type); send_selector->set_stage((DwarfControl::BuildSelectorStage)build_selector->stage); - for (int i = 0; i < build_selector->errors.size(); i++) + for (size_t i = 0; i < build_selector->errors.size(); i++) { if (build_selector->errors[i]) send_selector->add_errors(*build_selector->errors[i]); } - for (int i = 0; i < build_selector->choices.size(); i++) + for (size_t i = 0; i < build_selector->choices.size(); i++) { auto choice = build_selector->choices[i]; auto send_choice = send_selector->add_choices(); diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp index f4bf13e2c..0177305d7 100644 --- a/plugins/remotefortressreader/remotefortressreader.cpp +++ b/plugins/remotefortressreader/remotefortressreader.cpp @@ -1815,7 +1815,7 @@ static command_result GetUnitListInside(color_ostream &stream, const BlockReques } else { - for (int i = 0; i < unit->actions.size(); i++) + for (size_t i = 0; i < unit->actions.size(); i++) { auto action = unit->actions[i]; switch (action->type)