From 440a633fccda1ba20c66b13ab2bba6b0b9549aa6 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sat, 27 Apr 2024 08:50:46 +0100 Subject: [PATCH] Codechange: Remove shrink_to_fit for more lists. A comment about "will actually do nothing" is out of date as that is not the case with std::vector. These lists are always short lived (either within a command handler or in a window) so don't shrink_to_fit. --- src/fios.cpp | 2 -- src/vehiclelist.cpp | 6 ------ 2 files changed, 8 deletions(-) diff --git a/src/fios.cpp b/src/fios.cpp index e647404bc2..5bb7a2d2d1 100644 --- a/src/fios.cpp +++ b/src/fios.cpp @@ -374,8 +374,6 @@ static void FiosGetFileList(SaveLoadOperation fop, bool show_dirs, FiosGetTypeAn /* Show drives */ FiosGetDrives(file_list); - - file_list.shrink_to_fit(); } /** diff --git a/src/vehiclelist.cpp b/src/vehiclelist.cpp index f6295681ad..48214d9384 100644 --- a/src/vehiclelist.cpp +++ b/src/vehiclelist.cpp @@ -108,11 +108,6 @@ void BuildDepotVehicleList(VehicleType type, TileIndex tile, VehicleList *engine BuildDepotVehicleListData bdvld{engines, wagons, type, individual_wagons}; FindVehicleOnPos(tile, &bdvld, BuildDepotVehicleListProc); - - /* Ensure the lists are not wasting too much space. If the lists are fresh - * (i.e. built within a command) then this will actually do nothing. */ - engines->shrink_to_fit(); - if (wagons != nullptr && wagons != engines) wagons->shrink_to_fit(); } /** @@ -176,6 +171,5 @@ bool GenerateVehicleSortList(VehicleList *list, const VehicleListIdentifier &vli default: return false; } - list->shrink_to_fit(); return true; }