From 2e3b1cf2d5dbe8842cff75df9e32f5b518da6f17 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Thu, 3 Sep 2026 20:42:11 -0400 Subject: [PATCH] Fix function return warnings with unreachable --- src/openvic-simulation/core/error/Error.hpp | 4 ++++ src/openvic-simulation/country/CountryInstance.cpp | 2 ++ src/openvic-simulation/misc/GameRulesManager.cpp | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/openvic-simulation/core/error/Error.hpp b/src/openvic-simulation/core/error/Error.hpp index f96b92f71..d28ca1ad6 100644 --- a/src/openvic-simulation/core/error/Error.hpp +++ b/src/openvic-simulation/core/error/Error.hpp @@ -3,6 +3,8 @@ #include #include +#include "openvic-simulation/core/Typedefs.hpp" + namespace OpenVic { enum class Error : uint8_t { OK, // Being 0 means failure can be checked with "if (Error)" @@ -61,5 +63,7 @@ namespace OpenVic { case BUG: return "Bug"; case MAX: return ""; } + + OpenVic::unreachable(); } } diff --git a/src/openvic-simulation/country/CountryInstance.cpp b/src/openvic-simulation/country/CountryInstance.cpp index 20600dd7f..8c1960605 100644 --- a/src/openvic-simulation/country/CountryInstance.cpp +++ b/src/openvic-simulation/country/CountryInstance.cpp @@ -381,6 +381,8 @@ bool CountryInstance::may_build_in(const BuildingRestrictionCategory restriction case BuildingRestrictionCategory::FACTORY: return rule_set.may_invest_in_building_factory_abroad(); } + + OpenVic::unreachable(); } CountryRelationManager::relation_value_type CountryInstance::get_relations_with(CountryInstance const& country) const { diff --git a/src/openvic-simulation/misc/GameRulesManager.cpp b/src/openvic-simulation/misc/GameRulesManager.cpp index acd021084..8b7dac0ce 100644 --- a/src/openvic-simulation/misc/GameRulesManager.cpp +++ b/src/openvic-simulation/misc/GameRulesManager.cpp @@ -1,5 +1,6 @@ #include "GameRulesManager.hpp" +#include "openvic-simulation/core/Typedefs.hpp" #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/map/ProvinceDefinition.hpp" #include "openvic-simulation/map/ProvinceInstance.hpp" @@ -24,6 +25,8 @@ bool GameRulesManager::may_use_coastal_artisanal_production_types(ProvinceInstan case CoastalProvinces: return is_coastal_province; } + + OpenVic::unreachable(); } bool GameRulesManager::may_use_coastal_factory_production_types(State const& state) const { @@ -40,4 +43,6 @@ bool GameRulesManager::may_use_coastal_factory_production_types(State const& sta return is_coastal_state; } } -} \ No newline at end of file + + OpenVic::unreachable(); +}