Merge pull request #105 from OpenVicProject/add/ordered-map

2 files changed, 11 insertions, 8 deletions

diff --git a/src/openvic-simulation/research/Invention.hpp b/src/openvic-simulation/research/Invention.hpp
index a8ce96d..5d31155 100644
--- a/src/openvic-simulation/research/Invention.hpp
+++ b/src/openvic-simulation/research/Invention.hpp
@@ -2,6 +2,7 @@
 
 #include "openvic-simulation/misc/Modifier.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
+#include "openvic-simulation/types/OrderedContainers.hpp"
 
 namespace OpenVic {
 	struct Unit;
@@ -15,9 +16,9 @@ namespace OpenVic {
 	struct Invention : Modifier {
 		friend struct InventionManager;
 		//TODO implement limit and chance
-		using unit_set_t = std::set<Unit const*>;
-		using building_set_t = std::set<BuildingType const*>;
-		using crime_set_t = std::set<Crime const*>;
+		using unit_set_t = ordered_set<Unit const*>;
+		using building_set_t = ordered_set<BuildingType const*>;
+		using crime_set_t = ordered_set<Crime const*>;
 
 	private:
 		const bool PROPERTY_CUSTOM_PREFIX(news, is);
diff --git a/src/openvic-simulation/research/Technology.hpp b/src/openvic-simulation/research/Technology.hpp
index 1035a8e..3b0b1da 100644
--- a/src/openvic-simulation/research/Technology.hpp
+++ b/src/openvic-simulation/research/Technology.hpp
@@ -1,10 +1,12 @@
 #pragma once
 
+#include <cstdint>
+
+#include "openvic-simulation/economy/BuildingType.hpp"
+#include "openvic-simulation/military/Unit.hpp"
 #include "openvic-simulation/misc/Modifier.hpp"
 #include "openvic-simulation/types/Date.hpp"
-#include "openvic-simulation/military/Unit.hpp"
-#include "openvic-simulation/economy/BuildingType.hpp"
-#include <cstdint>
+#include "openvic-simulation/types/OrderedContainers.hpp"
 
 namespace OpenVic {
 	struct TechnologyFolder : HasIdentifier {
@@ -32,8 +34,8 @@ namespace OpenVic {
 	struct Technology : Modifier {
 		friend struct TechnologyManager;
 
-		using unit_set_t = std::set<Unit const*>;
-		using building_set_t = std::set<BuildingType const*>;
+		using unit_set_t = ordered_set<Unit const*>;
+		using building_set_t = ordered_set<BuildingType const*>;
 
 	private:
 		TechnologyArea const& PROPERTY(area);