|
|
@@ -11,6 +11,7 @@
|
|
|
#include <entt/meta/pointer.hpp>
|
|
|
#include <entt/meta/resolve.hpp>
|
|
|
#include <entt/meta/template.hpp>
|
|
|
+#include "../common/empty.h"
|
|
|
|
|
|
struct base {
|
|
|
base() = default;
|
|
|
@@ -49,11 +50,9 @@ struct clazz: base {
|
|
|
}
|
|
|
|
|
|
int value{};
|
|
|
- static inline int bucket{};
|
|
|
+ inline static int bucket{};
|
|
|
};
|
|
|
|
|
|
-struct local_only {};
|
|
|
-
|
|
|
struct argument {
|
|
|
argument(int val)
|
|
|
: value{val} {}
|
|
|
@@ -101,7 +100,7 @@ class MetaContext: public ::testing::Test {
|
|
|
entt::meta<int>(context)
|
|
|
.data<local_marker>("marker"_hs);
|
|
|
|
|
|
- entt::meta<local_only>(context)
|
|
|
+ entt::meta<test::empty>(context)
|
|
|
.type("quux"_hs);
|
|
|
|
|
|
entt::meta<argument>(context)
|
|
|
@@ -152,14 +151,14 @@ TEST_F(MetaContext, Resolve) {
|
|
|
ASSERT_TRUE(entt::resolve<clazz>());
|
|
|
ASSERT_TRUE(entt::resolve<clazz>(context));
|
|
|
|
|
|
- ASSERT_TRUE(entt::resolve<local_only>());
|
|
|
- ASSERT_TRUE(entt::resolve<local_only>(context));
|
|
|
+ ASSERT_TRUE(entt::resolve<test::empty>());
|
|
|
+ ASSERT_TRUE(entt::resolve<test::empty>(context));
|
|
|
|
|
|
ASSERT_TRUE(entt::resolve(entt::type_id<clazz>()));
|
|
|
ASSERT_TRUE(entt::resolve(context, entt::type_id<clazz>()));
|
|
|
|
|
|
- ASSERT_FALSE(entt::resolve(entt::type_id<local_only>()));
|
|
|
- ASSERT_TRUE(entt::resolve(context, entt::type_id<local_only>()));
|
|
|
+ ASSERT_FALSE(entt::resolve(entt::type_id<test::empty>()));
|
|
|
+ ASSERT_TRUE(entt::resolve(context, entt::type_id<test::empty>()));
|
|
|
|
|
|
ASSERT_TRUE(entt::resolve("foo"_hs));
|
|
|
ASSERT_FALSE(entt::resolve(context, "foo"_hs));
|