diff --git a/libs/common/include/s25util/enumUtils.h b/libs/common/include/s25util/enumUtils.h index 7ef6409..1115dfe 100644 --- a/libs/common/include/s25util/enumUtils.h +++ b/libs/common/include/s25util/enumUtils.h @@ -12,10 +12,10 @@ struct IsBitset : std::false_type {}; template -constexpr bool IsValidBitset = IsBitset::value && std::is_unsigned>::value; +constexpr bool IsValidBitset_v = IsBitset::value && std::is_unsigned>::value; template -using require_validBitset = std::enable_if_t>; +using require_validBitset = std::enable_if_t>; template> constexpr auto operator&(Enum lhs, Enum rhs) noexcept diff --git a/tests/testEnumUtils.cpp b/tests/testEnumUtils.cpp index bfcbdfc..ba4d3f1 100644 --- a/tests/testEnumUtils.cpp +++ b/tests/testEnumUtils.cpp @@ -24,10 +24,10 @@ MAKE_BITSET_STRONG(Bitset); // Check type traits static_assert(IsBitset::value); -static_assert(!IsValidBitset); +static_assert(!IsValidBitset_v); static_assert(IsBitset::value); -static_assert(IsValidBitset); +static_assert(IsValidBitset_v); BOOST_AUTO_TEST_SUITE(EnumUtils)