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/country/Country.hpp | |
| parent | 0a425fbe05d6138b753c0e4a7c06f06695bde8af (diff) | |
| parent | e1496a87178d925277aceed0ebcbab06920e15ee (diff) | |
Merge pull request #105 from OpenVicProject/add/ordered-map
Diffstat (limited to 'src/openvic-simulation/country/Country.hpp')
| -rw-r--r-- | src/openvic-simulation/country/Country.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/openvic-simulation/country/Country.hpp b/src/openvic-simulation/country/Country.hpp index c35cf4f..76254a2 100644 --- a/src/openvic-simulation/country/Country.hpp +++ b/src/openvic-simulation/country/Country.hpp @@ -21,6 +21,7 @@ #include "openvic-simulation/types/Colour.hpp" #include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" +#include "openvic-simulation/types/OrderedContainers.hpp" namespace OpenVic { struct GameManager; @@ -29,7 +30,7 @@ namespace OpenVic { struct CountryParty : HasIdentifier { friend struct CountryManager; - using policy_map_t = std::map<IssueGroup const*, Issue const*>; + using policy_map_t = ordered_map<IssueGroup const*, Issue const*>; private: const Date PROPERTY(start_date); @@ -50,8 +51,8 @@ namespace OpenVic { struct Country : HasIdentifierAndColour { friend struct CountryManager; - using unit_names_map_t = std::map<Unit const*, std::vector<std::string>>; - using government_colour_map_t = std::map<GovernmentType const*, colour_t>; + using unit_names_map_t = ordered_map<Unit const*, std::vector<std::string>>; + using government_colour_map_t = ordered_map<GovernmentType const*, colour_t>; private: GraphicalCultureType const& PROPERTY(graphical_culture); |