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/map/Province.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/map/Province.hpp')
| -rw-r--r-- | src/openvic-simulation/map/Province.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/openvic-simulation/map/Province.hpp b/src/openvic-simulation/map/Province.hpp index 7a42666..bb10b29 100644 --- a/src/openvic-simulation/map/Province.hpp +++ b/src/openvic-simulation/map/Province.hpp @@ -2,10 +2,11 @@ #include <cassert> +#include "openvic-simulation/country/Country.hpp" #include "openvic-simulation/economy/BuildingInstance.hpp" #include "openvic-simulation/politics/Ideology.hpp" #include "openvic-simulation/pop/Pop.hpp" -#include "openvic-simulation/country/Country.hpp" +#include "openvic-simulation/types/OrderedContainers.hpp" namespace OpenVic { struct Map; @@ -81,7 +82,7 @@ namespace OpenVic { fvec2_t factory; fvec2_t building_construction; fvec2_t military_construction; - std::map<BuildingType const*, fvec2_t> building_position; + ordered_map<BuildingType const*, fvec2_t> building_position; fixed_point_map_t<BuildingType const*> building_rotation; }; |