Eliminate compiler warnings. (#569)

* Eliminate compiler warnings.

* Formatting.

src/hoi4_world/countries/hoi4_country_converter_tests.cpp

@@ -2294,7 +2294,7 @@ TEST(Hoi4worldCountriesCountryConverter, ConvoysConvert)
        .vic3_state_ids_to_hoi4_state_ids{{1, 1}, {2, 2}, {3, 3}},
        .hoi4_state_ids_to_owner{{1, "TAG"}, {2, "TAG"}, {3, "ABC"}}});
    mappers::TemplateMap templates;
-   ConvoyDistributor convoy_distributor(111, {{"pm_port_1", 1}, {"pm_port_2", 10}, {"pm_port_3", 100}});
+   ConvoyDistributor convoy_distributor(111, {{"pm_port_1", 1.0F}, {"pm_port_2", 10.0F}, {"pm_port_3", 100.0F}});
    convoy_distributor.CalculateStateWeights(source_world);
 
    const auto country_one = ConvertCountry(source_world,
@@ -2395,8 +2395,8 @@ TEST(Hoi4worldCountriesCountryConverter, NaviesConvert)
        EquipmentVariant("1936 Ship", "mtg_1936_ship", {}, {}, {}),
    };
    std::vector<TaskForceTemplate> task_force_templates{
-       {{{"pm_victorian", 5}}, {Ship("Cruiser", "basic_ship", "mtg_basic_ship", "legacy_basic_ship", "Basic Ship")}},
-       {{{"pm_modern", 10}}, {Ship("Battleship", "1936_ship", "mtg_1936_ship", "legacy_1936_ship", "1936 Ship")}},
+       {{{"pm_victorian", 5.0F}}, {Ship("Cruiser", "basic_ship", "mtg_basic_ship", "legacy_basic_ship", "Basic Ship")}},
+       {{{"pm_modern", 10.0F}}, {Ship("Battleship", "1936_ship", "mtg_1936_ship", "legacy_1936_ship", "1936 Ship")}},
    };
 
    const auto country_one = ConvertCountry(source_world,

src/hoi4_world/localizations/localizations_converter.cpp

@@ -332,6 +332,8 @@ commonItems::LocalizationDatabase ConvertIdeaLocalizations(const commonItems::Lo
    commonItems::LocalizationDatabase idea_localizations("english",
        {"braz_por", "french", "german", "japanese", "polish", "russian", "spanish"});
 
+#pragma warning(push)
+#pragma warning(disable : 4566)
    commonItems::LocalizationBlock male_localization_block("king", "english");
    male_localization_block.ModifyLocalization("english", "King {}");
    male_localization_block.ModifyLocalization("braz_por", "Rei {}");
@@ -403,7 +405,7 @@ commonItems::LocalizationDatabase ConvertIdeaLocalizations(const commonItems::Lo
    female_localization_description_block.ModifyLocalization("spanish",
        "Reunida en torno a la Reina de [{}.GetName] y las tierras [{}.GetAdjective]s, la nación [{}.GetAdjective] está "
        "unida y orgullosa de su legado imperial.");
-
+#pragma warning(pop)
 
    for (const auto& [tag, country]: hoi4_countries)
    {

src/hoi4_world/localizations/localizations_converter_tests.cpp

@@ -566,6 +566,9 @@ TEST(Hoi4worldLocalizationsLocalizationsconverter, IdeaLocalizationsCanBeConvert
    const std::string idea_one_desc = fmt::format("{}_desc", idea_one_name);
    const std::optional<commonItems::LocalizationBlock> one_localization_block =
        hoi4_localizations.GetIdeaLocalizations().GetLocalizationBlock(idea_one_name);
+
+#pragma warning(push)
+#pragma warning(disable : 4566)
    EXPECT_THAT(one_localization_block.value_or(commonItems::LocalizationBlock{"", ""}).GetLocalizations(),
        testing::UnorderedElementsAre(testing::Pair("english", "King MaleName Surname"),
            testing::Pair("braz_por", "Rei MaleName Surname"),
@@ -647,6 +650,7 @@ TEST(Hoi4worldLocalizationsLocalizationsconverter, IdeaLocalizationsCanBeConvert
            testing::Pair("spanish",
                "Reunida en torno a la Reina de [TWO.GetName] y las tierras [TWO.GetAdjective]s, la nación "
                "[TWO.GetAdjective] está unida y orgullosa de su legado imperial.")));
+#pragma warning(pop)
 }
 
 }  // namespace hoi4

src/hoi4_world/military/convoy_distributor_tests.cpp

@@ -9,7 +9,7 @@ namespace hoi4
 TEST(Hoi4MilitaryConvoyDistributorTests, EmptyWorldNoConvoys)
 {
    const vic3::World source_world = vic3::World(vic3::WorldOptions());
-   ConvoyDistributor convoy(100, {{"pm_port", 1}});
+   ConvoyDistributor convoy(100, {{"pm_port", 1.0F}});
    convoy.CalculateStateWeights(source_world);
    EXPECT_EQ(convoy.ConvoysFromState(1), 0);
 }
@@ -23,7 +23,7 @@ TEST(Hoi4MilitaryConvoyDistributorTests, HandlesUnstaffedPort)
        {1, {vic3::Building(vic3::BuildingType::Port, 1, 0, 0, std::vector<std::string>{"dummy", "pm_port_1"})}},
    });
    const vic3::World source_world = vic3::World(vic3::WorldOptions{.states = states, .buildings = buildings});
-   ConvoyDistributor convoy(100, {{"pm_port", 1}});
+   ConvoyDistributor convoy(100, {{"pm_port", 1.0F}});
    convoy.CalculateStateWeights(source_world);
    EXPECT_EQ(convoy.ConvoysFromState(1), 0);
 }
@@ -41,7 +41,7 @@ TEST(Hoi4MilitaryConvoyDistributorTests, WeightByProductionMethod)
        {3, {vic3::Building(vic3::BuildingType::Port, 3, 0, 1, std::vector<std::string>{"pm_port_3"})}},
    });
    const vic3::World source_world = vic3::World(vic3::WorldOptions{.states = states, .buildings = buildings});
-   ConvoyDistributor convoy(111, {{"pm_port_1", 1}, {"pm_port_2", 10}, {"pm_port_3", 100}});
+   ConvoyDistributor convoy(111, {{"pm_port_1", 1.0F}, {"pm_port_2", 10.0F}, {"pm_port_3", 100.0F}});
    convoy.CalculateStateWeights(source_world);
    EXPECT_EQ(convoy.ConvoysFromState(1), 1);
    EXPECT_EQ(convoy.ConvoysFromState(2), 10);
@@ -61,7 +61,7 @@ TEST(Hoi4MilitaryConvoyDistributorTests, WeightByStaffingLevel)
        {3, {vic3::Building(vic3::BuildingType::Port, 3, 0, 100, std::vector<std::string>{"pm_port_1"})}},
    });
    const vic3::World source_world = vic3::World(vic3::WorldOptions{.states = states, .buildings = buildings});
-   ConvoyDistributor convoy(111, {{"pm_port_1", 1}, {"pm_port_2", 10}, {"pm_port_3", 100}});
+   ConvoyDistributor convoy(111, {{"pm_port_1", 1.0F}, {"pm_port_2", 10.0F}, {"pm_port_3", 100.0F}});
    convoy.CalculateStateWeights(source_world);
    EXPECT_EQ(convoy.ConvoysFromState(1), 1);
    EXPECT_EQ(convoy.ConvoysFromState(2), 10);
@@ -81,7 +81,7 @@ TEST(Hoi4MilitaryConvoyDistributorTests, UnknownStateNoConvoys)
        {2, {vic3::Building(vic3::BuildingType::Port, 2, 0, 10, std::vector<std::string>{"dummy", "pm_port_1"})}},
    });
    const vic3::World source_world = vic3::World(vic3::WorldOptions{.states = states, .buildings = buildings});
-   ConvoyDistributor convoy(111, {{"pm_port_1", 1}, {"pm_port_2", 10}, {"pm_port_3", 100}});
+   ConvoyDistributor convoy(111, {{"pm_port_1", 1.0F}, {"pm_port_2", 10.0F}, {"pm_port_3", 100.0F}});
    convoy.CalculateStateWeights(source_world);
    EXPECT_EQ(convoy.ConvoysFromState(5), 0);
 }

src/hoi4_world/military/task_force_template_tests.cpp

@@ -32,28 +32,28 @@ TEST(Hoi4MilitaryTaskForceTemplateTests, TracksRequiredVariants)
 
 TEST(Hoi4MilitaryTaskForceTemplateTests, AddsShipsAndPaysCosts)
 {
-   const TaskForceTemplate tmpl1({{"pm_basic_bigship", 10}, {"pm_basic_smallship", 10}},
+   const TaskForceTemplate tmpl1({{"pm_basic_bigship", 10.0F}, {"pm_basic_smallship", 10.0F}},
        {
            Ship("Big Ship", "test1", "test1", "legacy_test1", "Basic Big Ship"),
            Ship("Small Ship", "test1", "test1", "legacy_test1", "Basic Small Ship"),
            Ship("Small Ship", "test1", "test1", "legacy_test1", "Basic Small Ship"),
        });
-   const TaskForceTemplate tmpl2({{"pm_1936_bigship", 10}, {"pm_1936_smallship", 10}},
+   const TaskForceTemplate tmpl2({{"pm_1936_bigship", 10.0F}, {"pm_1936_smallship", 10.0F}},
        {
            Ship("Big Ship", "test2", "test2", "legacy_test2", "1936 Big Ship"),
            Ship("Small Ship", "test2", "test2", "legacy_test2", "1936 Small Ship"),
            Ship("Small Ship", "test2", "test2", "legacy_test2", "1936 Small Ship"),
        });
-   const TaskForceTemplate tmpl3({{"pm_humongous", 1}},
+   const TaskForceTemplate tmpl3({{"pm_humongous", 1.0F}},
        {
            Ship("Humongous Ship", "test3", "test3", "legacy_test3", "1936 Humongous Ship"),
        });
 
    std::vector<Ship> ships;
-   std::map<std::string, float> naval_pms{{"pm_basic_bigship", 25},
-       {"pm_basic_smallship", 50},
-       {"pm_1936_bigship", 21},
-       {"pm_1936_smallship", 11}};
+   std::map<std::string, float> naval_pms{{"pm_basic_bigship", 25.0F},
+       {"pm_basic_smallship", 50.0F},
+       {"pm_1936_bigship", 21.0F},
+       {"pm_1936_smallship", 11.0F}};
    std::map<std::string, int> nameCounts;
    tmpl3.AddShipsIfPossible(ships, nameCounts, naval_pms);
    tmpl2.AddShipsIfPossible(ships, nameCounts, naval_pms);
@@ -70,11 +70,11 @@ TEST(Hoi4MilitaryTaskForceTemplateTests, AddsShipsAndPaysCosts)
            Ship("Small Ship 5", "test1", "test1", "legacy_test1", "Basic Small Ship"),
            Ship("Small Ship 6", "test1", "test1", "legacy_test1", "Basic Small Ship")));
    EXPECT_THAT(naval_pms,
-       testing::ContainerEq(std::map<std::string, float>{{"pm_basic_bigship", 5},
-           {"pm_basic_smallship", 30},
-           {"pm_1936_bigship", 11},
-           {"pm_1936_smallship", 1},
-           {"pm_humongous", 0}}));
+       testing::ContainerEq(std::map<std::string, float>{{"pm_basic_bigship", 5.0F},
+           {"pm_basic_smallship", 30.0F},
+           {"pm_1936_bigship", 11.0F},
+           {"pm_1936_smallship", 1.0F},
+           {"pm_humongous", 0.0F}}));
 }
 
 }  // namespace hoi4

src/hoi4_world/military/task_force_templates_builder_tests.cpp

@@ -24,10 +24,10 @@ TEST(Hoi4worldMilitaryTaskForceTemplatesBuilderTests, ImportsTaskForceTemplates)
    EXPECT_EQ(3, task_forces.size());
 
    std::vector<Ship> ships;
-   std::map<std::string, float> naval_pms{{"pm_basic_bigship", 25},
-       {"pm_basic_smallship", 50},
-       {"pm_1936_bigship", 21},
-       {"pm_1936_smallship", 11}};
+   std::map<std::string, float> naval_pms{{"pm_basic_bigship", 25.0F},
+       {"pm_basic_smallship", 50.0F},
+       {"pm_1936_bigship", 21.0F},
+       {"pm_1936_smallship", 11.0F}};
    std::map<std::string, int> nameCounts;
    for (const auto& tmpl: task_forces)
    {
@@ -45,11 +45,11 @@ TEST(Hoi4worldMilitaryTaskForceTemplatesBuilderTests, ImportsTaskForceTemplates)
            Ship("Small Ship 5", "test2", "test2", "legacy_test2", "1936 Small Ship"),
            Ship("Small Ship 6", "test2", "test2", "legacy_test2", "1936 Small Ship")));
    EXPECT_THAT(naval_pms,
-       testing::ContainerEq(std::map<std::string, float>{{"pm_basic_bigship", 5},
-           {"pm_basic_smallship", 30},
-           {"pm_1936_bigship", 11},
-           {"pm_1936_smallship", 1},
-           {"pm_humongous", 0}}));
+       testing::ContainerEq(std::map<std::string, float>{{"pm_basic_bigship", 5.0F},
+           {"pm_basic_smallship", 30.0F},
+           {"pm_1936_bigship", 11.0F},
+           {"pm_1936_smallship", 1.0F},
+           {"pm_humongous", 0.0F}}));
 }
 
 

src/mappers/resources/resource_mapper_importer.cpp

@@ -13,7 +13,7 @@ mappers::ResourceMapper mappers::ImportResourceMapper(std::string_view mapping_f
    commonItems::parser base_parser;
    base_parser.registerRegex(commonItems::catchallRegex,
        [&current](const std::string& key, std::istream& input_stream) {
-          current.base.emplace(key, commonItems::getDouble(input_stream));
+          current.base.emplace(key, static_cast<float>(commonItems::getDouble(input_stream)));
        });
 
    commonItems::parser score_parser;

src/mappers/unit/unit_mapper_importer.cpp

@@ -14,7 +14,7 @@ mappers::UnitMapper mappers::ImportUnitMapper(std::string_view mapping_file)
       current.equipment = commonItems::getInt(input_stream);
    });
    pm_parser.registerRegex(commonItems::catchallRegex, [&current](const std::string& key, std::istream& input_stream) {
-      current.units.emplace(key, commonItems::getDouble(input_stream));
+      current.units.emplace(key, static_cast<float>(commonItems::getDouble(input_stream)));
    });
 
    commonItems::parser file_parser;

src/mappers/unit/unit_mapper_tests.cpp

@@ -20,8 +20,8 @@ TEST(MappersUnitUnitMapperTests, NoRulesMeansNoUnits)
 TEST(MappersUnitUnitMapperTests, BattalionsAreMade)
 {
    TemplateMap templates{
-       {"trench_infantry", BattalionTemplate(50, {{"infantry", 0.25}})},
-       {"cavalry_scouts", BattalionTemplate(0, {{"cavalry", 0.20}})},
+       {"trench_infantry", BattalionTemplate(50, {{"infantry", 0.25F}})},
+       {"cavalry_scouts", BattalionTemplate(0, {{"cavalry", 0.20F}})},
        {"field_hospitals", BattalionTemplate(10, {})},
    };
    const UnitMapper unit_mapper(templates);