From 8bd985359702e8cb388d09841b4b5b11eefbcdab Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Wed, 8 Feb 2023 14:16:11 -0800 Subject: [PATCH] make gcc happy --- library/xml | 2 +- plugins/tailor.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/xml b/library/xml index cd5baf4ea..eb58cda0f 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit cd5baf4ea82fead3883368da526ac2b606a6209b +Subproject commit eb58cda0f106c20776c273516f010ce21c45f89d diff --git a/plugins/tailor.cpp b/plugins/tailor.cpp index 8b132397a..5511e2b5d 100644 --- a/plugins/tailor.cpp +++ b/plugins/tailor.cpp @@ -564,14 +564,14 @@ DFhackCExport command_result plugin_shutdown (color_ostream &out) { static void set_material_order() { material_order.clear(); - for (int i = 0; i < all_materials.size(); ++i) { - if (i == get_config_val(config, CONFIG_SILK_IDX)) + for (size_t i = 0; i < all_materials.size(); ++i) { + if (i == (size_t)get_config_val(config, CONFIG_SILK_IDX)) material_order.push_back(M_SILK); - else if (i == get_config_val(config, CONFIG_CLOTH_IDX)) + else if (i == (size_t)get_config_val(config, CONFIG_CLOTH_IDX)) material_order.push_back(M_CLOTH); - else if (i == get_config_val(config, CONFIG_YARN_IDX)) + else if (i == (size_t)get_config_val(config, CONFIG_YARN_IDX)) material_order.push_back(M_YARN); - else if (i == get_config_val(config, CONFIG_LEATHER_IDX)) + else if (i == (size_t)get_config_val(config, CONFIG_LEATHER_IDX)) material_order.push_back(M_LEATHER); } if (!material_order.size())