diff --git a/lib/magic_enum b/lib/magic_enum index e55b9b54d..1384769c6 160000 --- a/lib/magic_enum +++ b/lib/magic_enum @@ -1 +1 @@ -Subproject commit e55b9b54d5cf61f8e117cafb17846d7d742dd3b4 +Subproject commit 1384769c66bd16ec9bb1353f45fe8ec8ccc12dbd diff --git a/src/util/QMagicEnum.hpp b/src/util/QMagicEnum.hpp index 518d5d52b..6f5efe65d 100644 --- a/src/util/QMagicEnum.hpp +++ b/src/util/QMagicEnum.hpp @@ -57,7 +57,7 @@ template constexpr bool eq( QStringView a, QStringView b, [[maybe_unused]] BinaryPredicate && - p) noexcept(magic_enum::detail::is_nothrow_invocable()) + p) noexcept(magic_enum::detail::is_nothrow_invocable_v) { // Note: QStringView::operator== isn't constexpr if (a.size() != b.size()) diff --git a/src/util/QMagicEnumTagged.hpp b/src/util/QMagicEnumTagged.hpp index a5bca4d92..dafd9fbf0 100644 --- a/src/util/QMagicEnumTagged.hpp +++ b/src/util/QMagicEnumTagged.hpp @@ -71,7 +71,8 @@ inline constexpr auto TAGGED_DATA_STORAGE = template consteval auto enumTaggedDataStorage() { - constexpr std::string_view utf8 = TAGGED_DATA_STORAGE; + constexpr std::string_view utf8 = + TAGGED_DATA_STORAGE.str(); static_assert(isLatin1(utf8), "Can't convert non-latin1 UTF8 to UTF16");