Use direct vector declarations in library tests

src/test/cpp/net/eagle0/shardok/library/HexMap_test_helpers.cpp

@@ -132,26 +132,26 @@ void EmplaceHexMap(GameStateW &gameState, const HexMap *hexMap) {
     using Coords = net::eagle0::shardok::storage::fb::Coords;
     using StartingPositionList = net::eagle0::shardok::storage::fb::StartingPositionList;
 
-    for (uint32_t i = 0; i < hexMap->terrain()->size(); ++i) {
+    for (uint32_t i = 0; i < hexMap->terrain()->size(); i++) {
         *const_cast<Terrain *>(destMap->mutable_terrain()->GetMutableObject(i)) =
                 *hexMap->terrain()->Get(i);
     }
-    for (uint32_t i = 0; i < hexMap->monthly_weather()->size(); ++i) {
+    for (uint32_t i = 0; i < hexMap->monthly_weather()->size(); i++) {
         *const_cast<MonthlyWeather *>(destMap->mutable_monthly_weather()->GetMutableObject(i)) =
                 *hexMap->monthly_weather()->Get(i);
     }
-    for (uint32_t i = 0; i < hexMap->defender_starting_positions()->positions()->size(); ++i) {
+    for (uint32_t i = 0; i < hexMap->defender_starting_positions()->positions()->size(); i++) {
         *const_cast<Coords *>(destMap->mutable_defender_starting_positions()
                                       ->mutable_positions()
                                       ->GetMutableObject(i)) =
                 *hexMap->defender_starting_positions()->positions()->Get(i);
     }
-    for (uint32_t i = 0; i < hexMap->attacker_starting_positions()->size(); ++i) {
+    for (uint32_t i = 0; i < hexMap->attacker_starting_positions()->size(); i++) {
         const auto *asplOrigin = hexMap->attacker_starting_positions()->Get(i);
         auto *asplDest = const_cast<StartingPositionList *>(
                 destMap->mutable_attacker_starting_positions()->GetMutableObject(i));
 
-        for (uint32_t j = 0; j < asplOrigin->positions()->size(); ++j) {
+        for (uint32_t j = 0; j < asplOrigin->positions()->size(); j++) {
             *const_cast<Coords *>(asplDest->mutable_positions()->GetMutableObject(j)) =
                     *asplOrigin->positions()->Get(j);
         }
@@ -201,7 +201,7 @@ auto MakeHexMapProto(
     }
 
     for (const auto &mw : monthlyWeathers) { *hmp.add_monthly_weather() = mw; }
-    for (int i = 0; i < 12; ++i) {
+    for (int i = 0; i < 12; i++) {
         auto *mw = hmp.add_monthly_weather();
         mw->set_sun_chance(100);
     }

src/test/cpp/net/eagle0/shardok/library/ZoneOfControlCalculator_test.cpp

@@ -32,7 +32,7 @@ TEST_F(ZoneOfControlCalculatorTests, AttackOrientation_noAlliesPresent_isFrontal
     auto attOff = AddGenericUnit(0, 0, Coords(2, 2));
     auto defOff = AddGenericUnit(1, 1, Coords(2, 1));
 
-    auto unitsVec = std::vector<Unit>{attOff, defOff};
+    std::vector<Unit> unitsVec{attOff, defOff};
     auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     fbb.Finish(unitsOff);
@@ -57,7 +57,7 @@ TEST_F(ZoneOfControlCalculatorTests, AttackOrientation_alliesNotFlanking_isFront
     auto allyOff = AddGenericUnit(0, 1, Coords(1, 1));
     auto defOff = AddGenericUnit(1, 2, Coords(2, 1));
 
-    auto unitsVec = std::vector<Unit>{attOff, allyOff, defOff};
+    std::vector<Unit> unitsVec{attOff, allyOff, defOff};
     auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     fbb.Finish(unitsOff);
@@ -85,7 +85,7 @@ TEST_F(ZoneOfControlCalculatorTests, AttackOrientation_flankingLeft_isFlanking)
     auto allyOff = AddGenericUnit(0, 1, Coords(3, 0));
     auto defOff = AddGenericUnit(1, 2, Coords(2, 1));
 
-    auto unitsVec = std::vector<Unit>{attOff, allyOff, defOff};
+    std::vector<Unit> unitsVec{attOff, allyOff, defOff};
     auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     fbb.Finish(unitsOff);
@@ -113,7 +113,7 @@ TEST_F(ZoneOfControlCalculatorTests, AttackOrientation_flankingRight_isFlanking)
     auto allyOff = AddGenericUnit(0, 1, Coords(1, 0));
     auto defOff = AddGenericUnit(1, 2, Coords(2, 1));
 
-    auto unitsVec = std::vector<Unit>{attOff, allyOff, defOff};
+    std::vector<Unit> unitsVec{attOff, allyOff, defOff};
     auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     fbb.Finish(unitsOff);
@@ -141,7 +141,7 @@ TEST_F(ZoneOfControlCalculatorTests, AttackOrientation_rear_isRear) {
     auto allyOff = AddGenericUnit(0, 1, Coords(2, 0));
     auto defOff = AddGenericUnit(1, 2, Coords(2, 1));
 
-    auto unitsVec = std::vector<Unit>{attOff, allyOff, defOff};
+    std::vector<Unit> unitsVec{attOff, allyOff, defOff};
     auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     fbb.Finish(unitsOff);
@@ -179,7 +179,7 @@ TEST_F(ZoneOfControlCalculatorTests, LowMorale_doesntExertZoc) {
     auto allyOff = AddGenericUnit(0, 1, Coords(3, 0));
     auto defOff = AddGenericUnit(1, 2, Coords(2, 1));
 
-    auto unitsVec = std::vector<Unit>{attOff, allyOff, defOff};
+    std::vector<Unit> unitsVec{attOff, allyOff, defOff};
     auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     fbb.Finish(unitsOff);

src/test/cpp/net/eagle0/shardok/library/action_factories/PlayerSetupCommandFactory_test.cpp

@@ -22,7 +22,7 @@ private:
         auto attacker1Off = AddGenericUnit(0, 0, reserveLocation);
         auto attacker2Off = AddGenericUnit(0, 1, reserveLocation);
         auto defenderOff = AddGenericUnit(1, 2, reserveLocation);
-        auto vec = std::vector<Unit>{attacker1Off, attacker2Off, defenderOff};
+        std::vector<Unit> vec{attacker1Off, attacker2Off, defenderOff};
         auto unitsOff = fbb.CreateVectorOfSortedStructs(&vec);
 
         auto hexMap = AddHexMap(fbb, MAP_WITH_STARTING_POSITIONS_FB);

src/test/cpp/net/eagle0/shardok/library/action_result_applier/ActionResultApplier_test.cpp

@@ -24,7 +24,7 @@ class ActionResultApplierTest : public ::testing::Test {
         auto undeadOffset = AddGenericUndead(0, 1, Coords(-1, -1));
         auto unit2Offset = AddGenericUnit(0, 2, Coords(4, 4));
 
-        auto unitsVec = std::vector<Unit>{unit1Offset, undeadOffset, unit2Offset};
+        std::vector<Unit> unitsVec{unit1Offset, undeadOffset, unit2Offset};
         auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
         std::vector<UnitId> possibleChargees(8, -1);

src/test/cpp/net/eagle0/shardok/library/command_factories/BraveWaterCommandFactory_test.cpp

@@ -26,7 +26,7 @@ class BraveWaterCommandFactoryTest : public ::testing::Test {
         fbb.ForceDefaults(true);
         auto actorOffset = AddGenericUnit(1, 0, position);
 
-        auto unitsVec = std::vector<Unit>{actorOffset};
+        std::vector<Unit> unitsVec{actorOffset};
         auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
         fbb.Finish(unitsOffset);
@@ -114,7 +114,7 @@ TEST_F(BraveWaterCommandFactoryTest, cannotBraveIntoAnotherUnit) {
     auto actorOffset = AddGenericUnit(1, 0, position);
     auto anotherOffset = AddGenericUnit(0, 1, Coords(4, 2));
 
-    auto unitsVec = std::vector<Unit>{actorOffset, anotherOffset};
+    std::vector<Unit> unitsVec{actorOffset, anotherOffset};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     fbb.Finish(unitsOffset);

src/test/cpp/net/eagle0/shardok/library/commands/BlowBridgeCommand_test.cpp

@@ -19,7 +19,7 @@ class BlowBridgeCommandTest : public ::testing::Test {
         flatbuffers::FlatBufferBuilder fbb;
         fbb.ForceDefaults(true);
         Unit actorUnit = AddGenericUnit(0, 0, bridgePosition);
-        auto unitsVec = std::vector<Unit>{actorUnit};
+        std::vector<Unit> unitsVec{actorUnit};
         auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
         GameStateBuilder gsb(fbb);

src/test/cpp/net/eagle0/shardok/library/commands/BuildBridgeCommand_test.cpp

@@ -19,7 +19,7 @@ class BuildBridgeCommandTest : public ::testing::Test {
         flatbuffers::FlatBufferBuilder fbb;
         fbb.ForceDefaults(true);
         Unit actorUnit = AddGenericUnit(0, 0, Coords(3, 1));
-        auto unitsVec = std::vector<Unit>{actorUnit};
+        std::vector<Unit> unitsVec{actorUnit};
         auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
         GameStateBuilder gsb(fbb);

src/test/cpp/net/eagle0/shardok/library/commands/FleeCommand_test.cpp

@@ -21,7 +21,7 @@ class FleeCommandTest : public ::testing::Test {
         flatbuffers::FlatBufferBuilder fbb;
         fbb.ForceDefaults(true);
         auto unitOff = AddGenericUnit(0, 0, Coords(3, 3));
-        auto unitVec = std::vector<Unit>{unitOff};
+        std::vector<Unit> unitVec{unitOff};
         auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitVec);
 
         GameStateBuilder gsb(fbb);

src/test/cpp/net/eagle0/shardok/library/fb_helpers/GameStateHelpers_test.cpp

@@ -100,7 +100,7 @@ TEST_F(GameStateHelpersTests, newBufferFromCopy_setsFields) {
     EXPECT_GE(newGs->units()->size(), 6);
     // Find our unit with ID 19 (it might not be at index 0 due to reserved slots)
     bool foundUnit = false;
-    for (size_t i = 0; i < newGs->units()->size(); ++i) {
+    for (size_t i = 0; i < newGs->units()->size(); i++) {
         if (newGs->units()->Get(static_cast<unsigned int>(i))->unit_id() == 19) {
             foundUnit = true;
             EXPECT_EQ(5, newGs->units()->Get(static_cast<unsigned int>(i))->eagle_player_id());

src/test/cpp/net/eagle0/shardok/library/fb_helpers/HexMapHelpers_test.cpp

@@ -32,8 +32,8 @@ TEST_F(HexMapHelpersTests, convertProto_setsFields) {
     EXPECT_EQ(map.row_count(), fbMapPointer->row_count());
     EXPECT_EQ(map.column_count(), fbMapPointer->column_count());
 
-    for (int i = 0; i < map.row_count(); ++i) {
-        for (int j = 0; j < map.column_count(); ++j) {
+    for (int i = 0; i < map.row_count(); i++) {
+        for (int j = 0; j < map.column_count(); j++) {
             const auto index = i * map.column_count() + j;
             EXPECT_EQ(map.terrain(index).type(), fbMapPointer->terrain()->Get(index)->type());
 
@@ -60,8 +60,8 @@ TEST_F(HexMapHelpersTests, setUpInitialHexMap_freezesWaterInWinter) {
     EXPECT_EQ(map.row_count(), fbMapPointer->row_count());
     EXPECT_EQ(map.column_count(), fbMapPointer->column_count());
 
-    for (int i = 0; i < map.row_count(); ++i) {
-        for (int j = 0; j < map.column_count(); ++j) {
+    for (int i = 0; i < map.row_count(); i++) {
+        for (int j = 0; j < map.column_count(); j++) {
             const auto index = i * map.column_count() + j;
             EXPECT_EQ(map.terrain(index).type(), fbMapPointer->terrain()->Get(index)->type());