Browse Source

*: no entt:: namespace

skypjack 5 months ago
parent
commit
947d89844b
3 changed files with 9 additions and 9 deletions
  1. 3 3
      src/entt/entity/mixin.hpp
  2. 4 4
      src/entt/meta/factory.hpp
  3. 2 2
      src/entt/meta/meta.hpp

+ 3 - 3
src/entt/entity/mixin.hpp

@@ -150,15 +150,15 @@ public:
           destruction{allocator},
           update{allocator} {
         if constexpr(internal::has_on_construct<typename underlying_type::element_type, Registry>::value) {
-            entt::sink{construction}.template connect<&underlying_type::element_type::on_construct>();
+            sink{construction}.template connect<&underlying_type::element_type::on_construct>();
         }
 
         if constexpr(internal::has_on_update<typename underlying_type::element_type, Registry>::value) {
-            entt::sink{update}.template connect<&underlying_type::element_type::on_update>();
+            sink{update}.template connect<&underlying_type::element_type::on_update>();
         }
 
         if constexpr(internal::has_on_destroy<typename underlying_type::element_type, Registry>::value) {
-            entt::sink{destruction}.template connect<&underlying_type::element_type::on_destroy>();
+            sink{destruction}.template connect<&underlying_type::element_type::on_destroy>();
         }
     }
 

+ 4 - 4
src/entt/meta/factory.hpp

@@ -175,7 +175,7 @@ public:
      * @return A meta factory for the given type.
      */
     meta_factory type(const char *name) noexcept {
-        return type(entt::hashed_string::value(name), name);
+        return type(hashed_string::value(name), name);
     }
 
     /**
@@ -294,7 +294,7 @@ public:
      */
     template<auto Data, typename Policy = as_is_t>
     meta_factory data(const char *name) noexcept {
-        return data<Data, Policy>(entt::hashed_string::value(name), name);
+        return data<Data, Policy>(hashed_string::value(name), name);
     }
 
     /**
@@ -363,7 +363,7 @@ public:
      */
     template<auto Setter, auto Getter, typename Policy = as_is_t>
     meta_factory data(const char *name) noexcept {
-        return data<Setter, Getter, Policy>(entt::hashed_string::value(name), name);
+        return data<Setter, Getter, Policy>(hashed_string::value(name), name);
     }
 
     /**
@@ -432,7 +432,7 @@ public:
      */
     template<auto Candidate, typename Policy = as_is_t>
     meta_factory func(const char *name) noexcept {
-        return func<Candidate, Policy>(entt::hashed_string::value(name), name);
+        return func<Candidate, Policy>(hashed_string::value(name), name);
     }
 
     /**

+ 2 - 2
src/entt/meta/meta.hpp

@@ -484,7 +484,7 @@ public:
         if constexpr(std::is_reference_v<Type> && !std::is_const_v<std::remove_reference_t<Type>>) {
             return meta_any{meta_ctx_arg, *ctx};
         } else {
-            return (storage.info() == entt::type_id<Type>()) ? as_ref() : allow_cast(meta_type{*ctx, internal::resolve<std::remove_cv_t<std::remove_reference_t<Type>>>(internal::meta_context::from(*ctx))});
+            return (storage.info() == type_id<Type>()) ? as_ref() : allow_cast(meta_type{*ctx, internal::resolve<std::remove_cv_t<std::remove_reference_t<Type>>>(internal::meta_context::from(*ctx))});
         }
     }
 
@@ -498,7 +498,7 @@ public:
         if constexpr(std::is_reference_v<Type> && !std::is_const_v<std::remove_reference_t<Type>>) {
             return allow_cast<const std::remove_reference_t<Type> &>() && (storage.data() != nullptr);
         } else {
-            return (storage.info() == entt::type_id<Type>()) || allow_cast(meta_type{*ctx, internal::resolve<std::remove_cv_t<std::remove_reference_t<Type>>>(internal::meta_context::from(*ctx))});
+            return (storage.info() == type_id<Type>()) || allow_cast(meta_type{*ctx, internal::resolve<std::remove_cv_t<std::remove_reference_t<Type>>>(internal::meta_context::from(*ctx))});
         }
     }