From 41d50b15ac978530a53ed99eea36f180e1d27b16 Mon Sep 17 00:00:00 2001
From: hop311 <hop3114@gmail.com>
Date: Fri, 14 Jun 2024 23:06:19 +0100
Subject: Renamed Country to CountryDefinition

---
 src/openvic-simulation/history/ProvinceHistory.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/openvic-simulation/history/ProvinceHistory.hpp')

diff --git a/src/openvic-simulation/history/ProvinceHistory.hpp b/src/openvic-simulation/history/ProvinceHistory.hpp
index 7c283f4..d6bf150 100644
--- a/src/openvic-simulation/history/ProvinceHistory.hpp
+++ b/src/openvic-simulation/history/ProvinceHistory.hpp
@@ -15,7 +15,7 @@
 namespace OpenVic {
 	struct ProvinceHistoryMap;
 	struct ProvinceDefinition;
-	struct Country;
+	struct CountryDefinition;
 	struct GoodDefinition;
 	struct TerrainType;
 	struct Ideology;
@@ -27,12 +27,12 @@ namespace OpenVic {
 	private:
 		ProvinceDefinition const& PROPERTY(province);
 
-		std::optional<Country const*> PROPERTY(owner);
-		std::optional<Country const*> PROPERTY(controller);
+		std::optional<CountryDefinition const*> PROPERTY(owner);
+		std::optional<CountryDefinition const*> PROPERTY(controller);
 		std::optional<ProvinceInstance::colony_status_t> PROPERTY(colonial);
 		std::optional<bool> PROPERTY(slave);
-		std::vector<Country const*> PROPERTY(add_cores);
-		std::vector<Country const*> PROPERTY(remove_cores);
+		std::vector<CountryDefinition const*> PROPERTY(add_cores);
+		std::vector<CountryDefinition const*> PROPERTY(remove_cores);
 		std::optional<GoodDefinition const*> PROPERTY(rgo);
 		std::optional<ProvinceInstance::life_rating_t> PROPERTY(life_rating);
 		std::optional<TerrainType const*> PROPERTY(terrain_type);
-- 
cgit v1.2.3-56-ga3b1