diff options
| author |   George L. Albany <Megacake1234@gmail.com> | 2024-01-01 04:32:01 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-01-01 04:32:01 +0100 |
| commit | 9988b21278dc1c8df044631bd2935a7e450a7bff (patch) | |
| tree | ba081f9f4d74865ab5851a2efd560745900ca81a /src/openvic-simulation/map/Map.cpp | |
| parent | 0a425fbe05d6138b753c0e4a7c06f06695bde8af (diff) | |
| parent | e1496a87178d925277aceed0ebcbab06920e15ee (diff) | |
Merge pull request #105 from OpenVicProject/add/ordered-map
Diffstat (limited to 'src/openvic-simulation/map/Map.cpp')
| -rw-r--r-- | src/openvic-simulation/map/Map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/map/Map.cpp b/src/openvic-simulation/map/Map.cpp index 39d4870..cce120e 100644 --- a/src/openvic-simulation/map/Map.cpp +++ b/src/openvic-simulation/map/Map.cpp @@ -2,7 +2,6 @@ #include <cassert> #include <cstddef> -#include <unordered_set> #include <vector> #include "openvic-simulation/economy/Good.hpp" @@ -10,6 +9,7 @@ #include "openvic-simulation/types/Colour.hpp" #include "openvic-simulation/utility/BMP.hpp" #include "openvic-simulation/utility/Logger.hpp" +#include "openvic-simulation/types/OrderedContainers.hpp" using namespace OpenVic; using namespace OpenVic::NodeTools; @@ -460,7 +460,7 @@ bool Map::load_map_images(fs::path const& province_path, fs::path const& terrain std::vector<fixed_point_map_t<TerrainType const*>> terrain_type_pixels_list(provinces.size()); bool ret = true; - std::unordered_set<colour_t> unrecognised_province_colours; + ordered_set<colour_t> unrecognised_province_colours; std::vector<fixed_point_t> pixels_per_province(provinces.size()); std::vector<fvec2_t> pixel_position_sum_per_province(provinces.size()); |