diff options
| author |   Spartan322 <Megacake1234@gmail.com> | 2023-12-25 08:42:11 +0100 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2023-12-31 20:46:26 +0100 |
| commit | e1496a87178d925277aceed0ebcbab06920e15ee (patch) | |
| tree | ba081f9f4d74865ab5851a2efd560745900ca81a /src/openvic-simulation/history/ProvinceHistory.hpp | |
| parent | 0a425fbe05d6138b753c0e4a7c06f06695bde8af (diff) | |
Add `https://github.com/Tessil/ordered-map`
Add is_specialization_of to Utility.hpp
Add OpenVic::ordered_map and OpenVic::ordered_set
Change `std::map` to `ordered_map`
Change `std::set to use `ordered_set`
Add `set_callback_pointer(tsl::ordered_set<T const*>& set)`
Add mutable_iterator to enable mutable value iterator for `tsl::ordered_map`
Add std::hash<OpenVic::Date> implementation
Enable deps/SCsub to expose dependency includes neccessary for inclusion
Diffstat (limited to 'src/openvic-simulation/history/ProvinceHistory.hpp')
| -rw-r--r-- | src/openvic-simulation/history/ProvinceHistory.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/openvic-simulation/history/ProvinceHistory.hpp b/src/openvic-simulation/history/ProvinceHistory.hpp index c3c8e67..0bda35d 100644 --- a/src/openvic-simulation/history/ProvinceHistory.hpp +++ b/src/openvic-simulation/history/ProvinceHistory.hpp @@ -11,6 +11,7 @@ #include "openvic-simulation/history/HistoryMap.hpp" #include "openvic-simulation/map/Province.hpp" #include "openvic-simulation/map/TerrainType.hpp" +#include "openvic-simulation/types/OrderedContainers.hpp" namespace OpenVic { struct ProvinceHistoryMap; @@ -30,8 +31,8 @@ namespace OpenVic { std::optional<Good const*> PROPERTY(rgo); std::optional<Province::life_rating_t> PROPERTY(life_rating); std::optional<TerrainType const*> PROPERTY(terrain_type); - std::map<BuildingType const*, BuildingType::level_t> PROPERTY(province_buildings); - std::map<BuildingType const*, BuildingType::level_t> PROPERTY(state_buildings); + ordered_map<BuildingType const*, BuildingType::level_t> PROPERTY(province_buildings); + ordered_map<BuildingType const*, BuildingType::level_t> PROPERTY(state_buildings); fixed_point_map_t<Ideology const*> PROPERTY(party_loyalties); std::vector<Pop> PROPERTY(pops); @@ -62,7 +63,7 @@ namespace OpenVic { struct ProvinceHistoryManager { private: - std::map<Province const*, ProvinceHistoryMap> PROPERTY(province_histories); + ordered_map<Province const*, ProvinceHistoryMap> PROPERTY(province_histories); bool locked = false; ProvinceHistoryMap* _get_or_make_province_history(Province const& province); |