From 37cdd775ac738b2a1264e32471385376e5a34f3a Mon Sep 17 00:00:00 2001 From: hop311 Date: Mon, 3 Jun 2024 23:39:34 +0100 Subject: Province const/mutable separation + State cleanup --- src/openvic-simulation/pop/Pop.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/openvic-simulation/pop/Pop.hpp') diff --git a/src/openvic-simulation/pop/Pop.hpp b/src/openvic-simulation/pop/Pop.hpp index fe1867f..7fc7456 100644 --- a/src/openvic-simulation/pop/Pop.hpp +++ b/src/openvic-simulation/pop/Pop.hpp @@ -23,7 +23,7 @@ namespace OpenVic { struct IdeologyManager; struct Issue; struct IssueManager; - struct Province; + struct ProvinceInstance; struct CountryParty; /* REQUIREMENTS: @@ -41,7 +41,7 @@ namespace OpenVic { Culture const& PROPERTY(culture); Religion const& PROPERTY(religion); pop_size_t PROPERTY(size); - Province const* PROPERTY_RW(location); + ProvinceInstance const* PROPERTY_RW(location); /* Last day's size change by source. */ pop_size_t PROPERTY(total_change); @@ -237,8 +237,6 @@ namespace OpenVic { return stream << ']'; } - struct Province; - struct PopManager { private: /* Using strata/stratas instead of stratum/strata to avoid confusion. */ -- cgit v1.2.3-56-ga3b1