Explorar o código

test: ENTT_ID_TYPE -> entt::id_type

Michele Caini %!s(int64=5) %!d(string=hai) anos
pai
achega
7692c4a377
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 1 1
      test/entt/core/type_traits.cpp
  2. 2 2
      test/lib/meta_plugin_std/types.h

+ 1 - 1
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<typename entt::tag<"foobar"_hs>::value_type, ENTT_ID_TYPE>));
+    ASSERT_TRUE((std::is_same_v<typename entt::tag<"foobar"_hs>::value_type, entt::id_type>));
 }

+ 2 - 2
test/lib/meta_plugin_std/types.h

@@ -12,12 +12,12 @@ struct type_id;
 #define ASSIGN_TYPE_ID(clazz)\
     template<>\
     struct type_id<clazz>\
-        : std::integral_constant<ENTT_ID_TYPE, entt::basic_hashed_string<std::remove_cv_t<std::remove_pointer_t<std::decay_t<decltype(#clazz)>>>>{#clazz}>\
+        : std::integral_constant<entt::id_type, entt::basic_hashed_string<std::remove_cv_t<std::remove_pointer_t<std::decay_t<decltype(#clazz)>>>>{#clazz}>\
     {}
 
 template<typename Type>
 struct entt::type_info<Type> {
-    static constexpr ENTT_ID_TYPE id() ENTT_NOEXCEPT {
+    static constexpr entt::id_type id() ENTT_NOEXCEPT {
         return type_id<Type>::value;
     }
 };