diff options
| author |   hop311 <hop3114@gmail.com> | 2024-01-22 20:17:38 +0100 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2024-01-22 20:25:09 +0100 |
| commit | caa2f31d536f568e485f15537db5e2f79f7616d5 (patch) | |
| tree | 7cd8a379963af18c24f8dabfe7525b39f2333e0c /src/openvic-simulation/pop/Pop.hpp | |
| parent | 8205732a1b95f018f0898a2a4bc62e22f5bee0d3 (diff) | |
Miscellaneous bug fixes and format cleanupmisc-changes
Diffstat (limited to 'src/openvic-simulation/pop/Pop.hpp')
| -rw-r--r-- | src/openvic-simulation/pop/Pop.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<PopType::income_type_t> : 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; } |