From 7692c4a3778d1b1ebdae725e9ebed5bd8ddb969f Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Sat, 11 Jul 2020 15:56:30 +0200 Subject: [PATCH] test: ENTT_ID_TYPE -> entt::id_type --- test/entt/core/type_traits.cpp | 2 +- test/lib/meta_plugin_std/types.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/entt/core/type_traits.cpp b/test/entt/core/type_traits.cpp index eb9812777..e66243175 100644 --- a/test/entt/core/type_traits.cpp +++ b/test/entt/core/type_traits.cpp @@ -66,5 +66,5 @@ TEST(TypeTraits, MemberClass) { TEST(TypeTraits, Tag) { ASSERT_EQ(entt::tag<"foobar"_hs>::value, entt::hashed_string::value("foobar")); - ASSERT_TRUE((std::is_same_v::value_type, ENTT_ID_TYPE>)); + ASSERT_TRUE((std::is_same_v::value_type, entt::id_type>)); } diff --git a/test/lib/meta_plugin_std/types.h b/test/lib/meta_plugin_std/types.h index f409002a7..156e154f3 100644 --- a/test/lib/meta_plugin_std/types.h +++ b/test/lib/meta_plugin_std/types.h @@ -12,12 +12,12 @@ struct type_id; #define ASSIGN_TYPE_ID(clazz)\ template<>\ struct type_id\ - : std::integral_constant>>>{#clazz}>\ + : std::integral_constant>>>{#clazz}>\ {} template struct entt::type_info { - static constexpr ENTT_ID_TYPE id() ENTT_NOEXCEPT { + static constexpr entt::id_type id() ENTT_NOEXCEPT { return type_id::value; } };