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/scripts/Condition.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/openvic-simulation/scripts/Condition.hpp') diff --git a/src/openvic-simulation/scripts/Condition.hpp b/src/openvic-simulation/scripts/Condition.hpp index e239142..5aa45e8 100644 --- a/src/openvic-simulation/scripts/Condition.hpp +++ b/src/openvic-simulation/scripts/Condition.hpp @@ -77,13 +77,13 @@ namespace OpenVic { template<> struct enable_bitfield : std::true_type {}; /* Returns true if the values have any bit in common. */ - constexpr inline bool share_value_type(value_type_t lhs, value_type_t rhs) { + inline constexpr bool share_value_type(value_type_t lhs, value_type_t rhs) { return (lhs & rhs) != value_type_t::NO_TYPE; } - constexpr inline bool share_scope(scope_t lhs, scope_t rhs) { + inline constexpr bool share_scope(scope_t lhs, scope_t rhs) { return (lhs & rhs) != scope_t::NO_SCOPE; } - constexpr inline bool share_identifier_type(identifier_type_t lhs, identifier_type_t rhs) { + inline constexpr bool share_identifier_type(identifier_type_t lhs, identifier_type_t rhs) { return (lhs & rhs) != identifier_type_t::NO_IDENTIFIER; } -- cgit v1.2.3-56-ga3b1