Use direct vectors in Shardok server setup

src/main/cpp/net/eagle0/shardok/server/ShardokGamesManager.cpp

@@ -172,7 +172,7 @@ auto SetUpController(
         const std::string &serializedRequest,
         const std::vector<std::pair<int32_t, std::vector<PlayerId>>> &watcherAllies)
         -> std::shared_ptr<ShardokGameController> {
-    auto unplacedUnits = std::vector<Unit>();
+    std::vector<Unit> unplacedUnits;
     unplacedUnits.reserve(units.size() + TutorialReinforcementUnitCount(tutorialConfig));
 
     UnitId nextUnitId = 0;

src/main/cpp/net/eagle0/shardok/shardok_server_main.cpp

@@ -73,7 +73,7 @@ auto main(const int argc, char **argv) -> int {
 
     FilesystemUtils::SetExecPath(argv[0]);
 
-    auto extraSettings = std::vector<std::string>();
+    std::vector<std::string> extraSettings;
     extraSettings.reserve(argc - 1);
     for (int i = 1; i < argc; i++) { extraSettings.emplace_back(argv[i]); }
 

src/test/cpp/net/eagle0/shardok/library/actions/UpdateGameStatusActionTest.cpp

@@ -51,7 +51,7 @@ TEST_F(UpdateGameStatusActionTests, onePlayerLeft_addsGameOverResult) {
 
     auto coords = net::eagle0::shardok::storage::fb::Coords(3, 3);
     auto onlyUnit = AddGenericUnit(0, 0, coords);
-    vector<Unit> unitsVec{onlyUnit};
+    auto unitsVec = vector<Unit>{onlyUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -96,7 +96,7 @@ TEST_F(UpdateGameStatusActionTests, twoPlayersLeft_noGameOverResult) {
     auto coords2 = net::eagle0::shardok::storage::fb::Coords(2, 1);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -137,7 +137,7 @@ TEST_F(UpdateGameStatusActionTests, onePlayerAllUnitsHidden_gameOverResult) {
     auto coords2 = net::eagle0::shardok::storage::fb::Coords(2, 1);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -183,7 +183,7 @@ TEST_F(UpdateGameStatusActionTests, remainingPlayerDoesNotHaveLastPlayerStanding
 
     auto coords1 = net::eagle0::shardok::storage::fb::Coords(3, 3);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
-    vector<Unit> unitsVec{attackerUnit};
+    auto unitsVec = vector<Unit>{attackerUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -232,7 +232,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_gameOverResult) {
     auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -287,7 +287,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_hiddenDefenderFlees)
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
     auto hiddenDefender = AddGenericUnit(1, 2, hiddenCoords);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit, hiddenDefender};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit, hiddenDefender};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -349,7 +349,7 @@ TEST_F(UpdateGameStatusActionTests,
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
     auto hiddenDefender = AddGenericUnit(1, 2, hiddenCoords);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit, hiddenDefender};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit, hiddenDefender};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -406,7 +406,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_hiddenDefenderTooTir
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
     auto hiddenDefender = AddGenericUnit(1, 2, hiddenCoords);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit, hiddenDefender};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit, hiddenDefender};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -467,7 +467,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_notHiddenDefender_do
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
     auto notHiddenDefender = AddGenericUnit(1, 2, hiddenCoords);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit, notHiddenDefender};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit, notHiddenDefender};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -522,7 +522,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_notEndOfRound_noGame
     auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -575,7 +575,7 @@ TEST_F(UpdateGameStatusActionTests,
     auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -633,7 +633,7 @@ TEST_F(UpdateGameStatusActionTests, allianceVictory_alliesHaveConditionSet_retur
     auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -695,7 +695,7 @@ TEST_F(UpdateGameStatusActionTests, allianceVictory_notAllAlliesHaveConditionSet
     auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -758,7 +758,7 @@ TEST_F(UpdateGameStatusActionTests,
     auto unit1 = AddGenericUnit(0, 0, castle1Coords);
     auto unit2 = AddGenericUnit(1, 1, castle2Coords);
     auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
-    vector<Unit> unitsVec{unit1, unit2, defenderUnit};
+    auto unitsVec = vector<Unit>{unit1, unit2, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -827,7 +827,7 @@ TEST_F(UpdateGameStatusActionTests, alliedCastleVictory_notMutuallyAllied_return
     auto unit1 = AddGenericUnit(0, 0, castle1Coords);
     auto unit2 = AddGenericUnit(1, 1, castle2Coords);
     auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
-    vector<Unit> unitsVec{unit1, unit2, defenderUnit};
+    auto unitsVec = vector<Unit>{unit1, unit2, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -891,7 +891,7 @@ TEST_F(UpdateGameStatusActionTests, alliedCastleVictory_missingVictoryCondition_
     auto unit1 = AddGenericUnit(0, 0, castle1Coords);
     auto unit2 = AddGenericUnit(1, 1, castle2Coords);
     auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
-    vector<Unit> unitsVec{unit1, unit2, defenderUnit};
+    auto unitsVec = vector<Unit>{unit1, unit2, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -953,7 +953,7 @@ TEST_F(UpdateGameStatusActionTests, alliedCastleVictory_emptyTile_returnsNoActio
     auto defenderCoords = net::eagle0::shardok::storage::fb::Coords(2, 1);
     auto unit1 = AddGenericUnit(0, 0, castle1Coords);
     auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
-    vector<Unit> unitsVec{unit1, defenderUnit};
+    auto unitsVec = vector<Unit>{unit1, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -1012,7 +1012,7 @@ TEST_F(UpdateGameStatusActionTests, allianceVictory_notAllAllied_returnsNoAction
     auto coords2 = net::eagle0::shardok::storage::fb::Coords(0, 3);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -1054,7 +1054,7 @@ TEST_F(UpdateGameStatusActionTests,
     auto coords2 = net::eagle0::shardok::storage::fb::Coords(2, 1);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -1109,7 +1109,7 @@ TEST_F(UpdateGameStatusActionTests, maxRoundsExceeded_noWinAfterMaxRounds_throws
     auto coords2 = net::eagle0::shardok::storage::fb::Coords(2, 1);
     auto attackerUnit = AddGenericUnit(0, 0, coords1);
     auto defenderUnit = AddGenericUnit(1, 1, coords2);
-    vector<Unit> unitsVec{attackerUnit, defenderUnit};
+    auto unitsVec = vector<Unit>{attackerUnit, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -1172,7 +1172,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_mutuallyAlliedCoAtta
     auto unit1 = AddGenericUnit(0, 0, castleCoords);
     auto unit2 = AddGenericUnit(1, 1, allyCoords);
     auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
-    vector<Unit> unitsVec{unit1, unit2, defenderUnit};
+    auto unitsVec = vector<Unit>{unit1, unit2, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);
@@ -1241,7 +1241,7 @@ TEST_F(UpdateGameStatusActionTests, attackerHoldsAllCastles_nonAlliedCoAttacker_
     auto unit1 = AddGenericUnit(0, 0, castleCoords);
     auto unit2 = AddGenericUnit(1, 1, allyCoords);
     auto defenderUnit = AddGenericUnit(2, 2, defenderCoords);
-    vector<Unit> unitsVec{unit1, unit2, defenderUnit};
+    auto unitsVec = vector<Unit>{unit1, unit2, defenderUnit};
     auto unitsOffset = fbb.CreateVectorOfSortedStructs(&unitsVec);
 
     auto statusBuilder = net::eagle0::shardok::storage::fb::GameStatusBuilder(fbb);