aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/politics
diff options
context:
space:
mode:
author Spartan322 <Megacake1234@gmail.com>2023-12-25 08:42:11 +0100
committer Spartan322 <Megacake1234@gmail.com>2023-12-31 20:46:26 +0100
commite1496a87178d925277aceed0ebcbab06920e15ee (patch)
treeba081f9f4d74865ab5851a2efd560745900ca81a /src/openvic-simulation/politics
parent0a425fbe05d6138b753c0e4a7c06f06695bde8af (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/politics')
-rw-r--r--src/openvic-simulation/politics/Rebel.hpp9
-rw-r--r--src/openvic-simulation/politics/Rule.hpp3
2 files changed, 7 insertions, 5 deletions
diff --git a/src/openvic-simulation/politics/Rebel.hpp b/src/openvic-simulation/politics/Rebel.hpp
index 29ae3ae..f7e8795 100644
--- a/src/openvic-simulation/politics/Rebel.hpp
+++ b/src/openvic-simulation/politics/Rebel.hpp
@@ -1,11 +1,12 @@
#pragma once
+#include <cstdint>
+
#include "openvic-simulation/misc/Modifier.hpp"
-#include "openvic-simulation/types/IdentifierRegistry.hpp"
#include "openvic-simulation/politics/Government.hpp"
#include "openvic-simulation/politics/Ideology.hpp"
-#include <cstdint>
-#include <unordered_map>
+#include "openvic-simulation/types/IdentifierRegistry.hpp"
+#include "openvic-simulation/types/OrderedContainers.hpp"
namespace OpenVic {
struct RebelManager;
@@ -13,7 +14,7 @@ namespace OpenVic {
struct RebelType : HasIdentifier {
friend struct RebelManager;
- using government_map_t = std::unordered_map<GovernmentType const*, GovernmentType const*>;
+ using government_map_t = ordered_map<GovernmentType const*, GovernmentType const*>;
using icon_t = uint16_t;
enum class area_t {
diff --git a/src/openvic-simulation/politics/Rule.hpp b/src/openvic-simulation/politics/Rule.hpp
index 260fb9e..4b47abf 100644
--- a/src/openvic-simulation/politics/Rule.hpp
+++ b/src/openvic-simulation/politics/Rule.hpp
@@ -1,6 +1,7 @@
#pragma once
#include "openvic-simulation/types/IdentifierRegistry.hpp"
+#include "openvic-simulation/types/OrderedContainers.hpp"
namespace OpenVic {
struct RuleManager;
@@ -18,7 +19,7 @@ namespace OpenVic {
struct RuleSet {
friend struct RuleManager;
- using rule_map_t = std::map<Rule const*, bool>;
+ using rule_map_t = ordered_map<Rule const*, bool>;
private:
rule_map_t rules;