Merge pull request #199 from OpenVicProject/pop_size_int32HEADmaster

Reduce pop size to int32

2 files changed, 3 insertions, 3 deletions

diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp
index 9221485..cde7013 100644
--- a/src/openvic-simulation/pop/Pop.cpp
+++ b/src/openvic-simulation/pop/Pop.cpp
@@ -642,8 +642,8 @@ bool PopManager::load_pop_bases_into_vector(
 		*non_integer_size = true;
 	}
 
-	if (culture != nullptr && religion != nullptr && size >= 1) {
-		vec.emplace_back(PopBase { type, *culture, *religion, size.to_int64_t(), militancy, consciousness, rebel_type });
+	if (culture != nullptr && religion != nullptr && size >= 1 && size <= std::numeric_limits<Pop::pop_size_t>::max()) {
+		vec.emplace_back(PopBase { type, *culture, *religion, size.to_int32_t(), militancy, consciousness, rebel_type });
 	} else {
 		Logger::warning(
 			"Some pop arguments are invalid: culture = ", culture, ", religion = ", religion, ", size = ", size
diff --git a/src/openvic-simulation/pop/Pop.hpp b/src/openvic-simulation/pop/Pop.hpp
index e8cab42..59a7794 100644
--- a/src/openvic-simulation/pop/Pop.hpp
+++ b/src/openvic-simulation/pop/Pop.hpp
@@ -32,7 +32,7 @@ namespace OpenVic {
 	struct PopBase {
 		friend struct PopManager;
 
-		using pop_size_t = int64_t;
+		using pop_size_t = int32_t;
 
 	protected:
 		PopType const& PROPERTY_ACCESS(type, protected);