diff --git a/src/entt/core/type_traits.hpp b/src/entt/core/type_traits.hpp index 2855c8062..6b597a935 100644 --- a/src/entt/core/type_traits.hpp +++ b/src/entt/core/type_traits.hpp @@ -78,7 +78,7 @@ inline constexpr std::size_t size_of_v = size_of::value; * @tparam Type A type to repeat. */ template -using unpack_as_t = Type; +using unpack_as_type = Type; /** * @brief Helper variable template to be used to _repeat_ the same value a @@ -86,7 +86,7 @@ using unpack_as_t = Type; * @tparam Value A value to repeat. */ template -inline constexpr auto unpack_as_v = Value; +inline constexpr auto unpack_as_value = Value; /** * @brief Wraps a static constant. diff --git a/test/entt/core/type_traits.cpp b/test/entt/core/type_traits.cpp index 1d0875769..b4bb9047a 100644 --- a/test/entt/core/type_traits.cpp +++ b/test/entt/core/type_traits.cpp @@ -30,7 +30,7 @@ TEST(TypeTraits, SizeOf) { TEST(TypeTraits, UnpackAsType) { auto test = [](auto &&...args) { - return [](entt::unpack_as_t... value) { + return [](entt::unpack_as_type... value) { return (value + ... + 0); }; }; @@ -40,7 +40,7 @@ TEST(TypeTraits, UnpackAsType) { TEST(TypeTraits, UnpackAsValue) { auto test = [](auto &&...args) { - return (entt::unpack_as_v<2, decltype(args)> + ... + 0); + return (entt::unpack_as_value<2, decltype(args)> + ... + 0); }; ASSERT_EQ(test('c', 42., true), 6);