From caa2f31d536f568e485f15537db5e2f79f7616d5 Mon Sep 17 00:00:00 2001 From: hop311 Date: Mon, 22 Jan 2024 19:17:38 +0000 Subject: Miscellaneous bug fixes and format cleanup --- src/openvic-simulation/pop/Pop.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 5a4cebf..4e173bb 100644 --- a/src/openvic-simulation/pop/Pop.hpp +++ b/src/openvic-simulation/pop/Pop.hpp @@ -184,7 +184,7 @@ namespace OpenVic { template<> struct enable_bitfield : std::true_type {}; /* This returns true if at least one income type is shared by both arguments. */ - constexpr inline bool share_income_type(PopType::income_type_t lhs, PopType::income_type_t rhs) { + inline constexpr bool share_income_type(PopType::income_type_t lhs, PopType::income_type_t rhs) { return (lhs & rhs) != PopType::income_type_t::NO_INCOME_TYPE; } -- cgit v1.2.3-56-ga3b1