diff --git a/test/entt/meta/meta_any.cpp b/test/entt/meta/meta_any.cpp index 0c300ccab..fe687dfa6 100644 --- a/test/entt/meta/meta_any.cpp +++ b/test/entt/meta/meta_any.cpp @@ -89,16 +89,16 @@ struct MetaAny: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("empty"_hs) .dtor(); - entt::meta() + entt::meta_factory{} .type("fat"_hs) .base() .dtor(); - entt::meta() + entt::meta_factory{} .type("clazz"_hs) .data<&clazz::value>("value"_hs) .func<&clazz::member>("member"_hs) diff --git a/test/entt/meta/meta_base.cpp b/test/entt/meta/meta_base.cpp index 7bd33c965..a69e35432 100644 --- a/test/entt/meta/meta_base.cpp +++ b/test/entt/meta/meta_base.cpp @@ -37,18 +37,18 @@ struct MetaBase: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .data<&base_1::value_1>("value_1"_hs); - entt::meta() + entt::meta_factory{} .conv() .data<&base_2::value_2>("value_2"_hs); - entt::meta() + entt::meta_factory{} .base() .data<&base_3::value_3>("value_3"_hs); - entt::meta() + entt::meta_factory{} .type("derived"_hs) .base() .base() diff --git a/test/entt/meta/meta_context.cpp b/test/entt/meta/meta_context.cpp index 5c1ea34b1..90d92b7f0 100644 --- a/test/entt/meta/meta_context.cpp +++ b/test/entt/meta/meta_context.cpp @@ -78,13 +78,13 @@ class MetaContext: public ::testing::Test { static void init_global_context() { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .data("marker"_hs); - entt::meta() + entt::meta_factory{} .conv<&argument::get>(); - entt::meta() + entt::meta_factory{} .type("foo"_hs) .custom(3) .ctor() @@ -92,27 +92,27 @@ class MetaContext: public ::testing::Test { .data<&clazz::value>("rw"_hs) .func<&clazz::func>("func"_hs); - entt::meta>() + entt::meta_factory>{} .type("template"_hs); } void init_local_context() { using namespace entt::literals; - entt::meta(context) + entt::meta_factory{context} .data("marker"_hs); - entt::meta(context) + entt::meta_factory{context} .type("quux"_hs); - entt::meta(context) + entt::meta_factory{context} .conv<&argument::get_mul>(); - entt::meta(context) + entt::meta_factory{context} .data<&base::value>("char"_hs) .func<&base::get>("get"_hs); - entt::meta(context) + entt::meta_factory{context} .type("bar"_hs) .custom('c') .base() @@ -122,7 +122,7 @@ class MetaContext: public ::testing::Test { .data<&clazz::value>("rw"_hs) .func<&clazz::cfunc>("func"_hs); - entt::meta>(context) + entt::meta_factory>{context} .type("template"_hs); } diff --git a/test/entt/meta/meta_conv.cpp b/test/entt/meta/meta_conv.cpp index 2d4d6785d..944f903a0 100644 --- a/test/entt/meta/meta_conv.cpp +++ b/test/entt/meta/meta_conv.cpp @@ -30,7 +30,7 @@ struct MetaConv: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("clazz"_hs) .conv() .conv<&clazz::to_bool>() diff --git a/test/entt/meta/meta_ctor.cpp b/test/entt/meta/meta_ctor.cpp index 10e7e3e1d..f8e89f06c 100644 --- a/test/entt/meta/meta_ctor.cpp +++ b/test/entt/meta/meta_ctor.cpp @@ -50,15 +50,15 @@ struct MetaCtor: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("double"_hs) .ctor(); - entt::meta() + entt::meta_factory{} .type("derived"_hs) .base(); - entt::meta() + entt::meta_factory{} .type("clazz"_hs) .ctor<&entt::registry::emplace_or_replace, entt::as_ref_t>() .ctor() diff --git a/test/entt/meta/meta_custom.cpp b/test/entt/meta/meta_custom.cpp index 64319e675..e093f7b04 100644 --- a/test/entt/meta/meta_custom.cpp +++ b/test/entt/meta/meta_custom.cpp @@ -22,7 +22,7 @@ struct MetaCustom: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("clazz"_hs) .custom('c') .data<&clazz::i>("i"_hs) @@ -132,7 +132,7 @@ TEST_F(MetaCustom, ReRegistration) { ASSERT_NE(static_cast(type.custom()), nullptr); ASSERT_EQ(*static_cast(type.custom()), 'c'); - entt::meta().custom(1); + entt::meta_factory{}.custom(1); type = entt::resolve(); ASSERT_NE(static_cast(type.custom()), nullptr); diff --git a/test/entt/meta/meta_data.cpp b/test/entt/meta/meta_data.cpp index 8aecb406b..3a5ec4040 100644 --- a/test/entt/meta/meta_data.cpp +++ b/test/entt/meta/meta_data.cpp @@ -91,18 +91,18 @@ struct MetaData: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("base"_hs) .dtor() .data<&base::value>("value"_hs); - entt::meta() + entt::meta_factory{} .type("derived"_hs) .base() .dtor() .data<&base::value>("value_from_base"_hs); - entt::meta() + entt::meta_factory{} .type("clazz"_hs) .data<&clazz::i, entt::as_ref_t>("i"_hs) .custom('c') @@ -118,7 +118,7 @@ struct MetaData: ::testing::Test { .data<&clazz::i, entt::as_void_t>("void"_hs) .conv(); - entt::meta() + entt::meta_factory{} .type("setter_getter"_hs) .data<&setter_getter::static_setter, &setter_getter::static_getter>("x"_hs) .data<&setter_getter::setter, &setter_getter::getter>("y"_hs) @@ -127,11 +127,11 @@ struct MetaData: ::testing::Test { .data("z_ro"_hs) .data("value"_hs); - entt::meta() + entt::meta_factory{} .type("multi_setter"_hs) .data, &multi_setter::value>("value"_hs); - entt::meta() + entt::meta_factory{} .type("array"_hs) .data<&array::global>("global"_hs) .data<&array::local>("local"_hs); @@ -163,7 +163,7 @@ ENTT_DEBUG_TEST_F(MetaDataDeathTest, UserTraits) { using traits_type = entt::internal::meta_traits; constexpr auto value = traits_type{static_cast>(traits_type::_user_defined_traits) + 1u}; - ASSERT_DEATH(entt::meta().data<&clazz::i>("j"_hs).traits(value), ""); + ASSERT_DEATH(entt::meta_factory{}.data<&clazz::i>("j"_hs).traits(value), ""); } TEST_F(MetaData, Custom) { @@ -640,14 +640,14 @@ TEST_F(MetaData, ReRegistration) { ASSERT_EQ(node.details->data.size(), 1u); ASSERT_TRUE(type.data("value"_hs)); - entt::meta().data<&base::value>("field"_hs); + entt::meta_factory{}.data<&base::value>("field"_hs); ASSERT_TRUE(node.details); ASSERT_EQ(node.details->data.size(), 2u); ASSERT_TRUE(type.data("value"_hs)); ASSERT_TRUE(type.data("field"_hs)); - entt::meta() + entt::meta_factory{} .data<&base::value>("field"_hs) .traits(test::meta_traits::one) .custom(3) @@ -665,8 +665,8 @@ TEST_F(MetaData, CollisionAndReuse) { ASSERT_FALSE(entt::resolve().data("cj"_hs)); ASSERT_TRUE(entt::resolve().data("j"_hs).is_const()); - ASSERT_NO_THROW(entt::meta().data<&clazz::i>("j"_hs)); - ASSERT_NO_THROW(entt::meta().data<&clazz::j>("cj"_hs)); + ASSERT_NO_THROW(entt::meta_factory{}.data<&clazz::i>("j"_hs)); + ASSERT_NO_THROW(entt::meta_factory{}.data<&clazz::j>("cj"_hs)); ASSERT_TRUE(entt::resolve().data("j"_hs)); ASSERT_TRUE(entt::resolve().data("cj"_hs)); diff --git a/test/entt/meta/meta_dtor.cpp b/test/entt/meta/meta_dtor.cpp index a45bb3493..eaf653c8b 100644 --- a/test/entt/meta/meta_dtor.cpp +++ b/test/entt/meta/meta_dtor.cpp @@ -29,7 +29,7 @@ struct MetaDtor: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("clazz"_hs) .ctor() .dtor(); @@ -108,7 +108,7 @@ TEST_F(MetaDtor, ReRegistration) { ASSERT_NE(node.dtor.dtor, nullptr); - entt::meta().dtor<&clazz::destroy_incr>(); + entt::meta_factory{}.dtor<&clazz::destroy_incr>(); entt::resolve().construct(entt::forward_as_meta(counter)).reset(); ASSERT_EQ(counter, 2); diff --git a/test/entt/meta/meta_factory.cpp b/test/entt/meta/meta_factory.cpp index 8f921f6d4..076e465f7 100644 --- a/test/entt/meta/meta_factory.cpp +++ b/test/entt/meta/meta_factory.cpp @@ -79,23 +79,19 @@ TEST_F(MetaFactory, Constructors) { ASSERT_NE(entt::resolve(entt::type_id()), entt::meta_type{}); ASSERT_EQ(entt::resolve(ctx, entt::type_id()), entt::meta_type{}); - - // this is because of entt::meta, which should be deprecated nowadays - ASSERT_FALSE(entt::resolve(entt::type_id()).is_integral()); + ASSERT_TRUE(entt::resolve(entt::type_id()).is_integral()); factory = entt::meta_factory{ctx}; ASSERT_NE(entt::resolve(entt::type_id()), entt::meta_type{}); ASSERT_NE(entt::resolve(ctx, entt::type_id()), entt::meta_type{}); - - // this is because of entt::meta, which should be deprecated nowadays - ASSERT_FALSE(entt::resolve(ctx, entt::type_id()).is_integral()); + ASSERT_TRUE(entt::resolve(ctx, entt::type_id()).is_integral()); } TEST_F(MetaFactory, Type) { using namespace entt::literals; - auto factory = entt::meta(); + entt::meta_factory factory{}; ASSERT_EQ(entt::resolve("foo"_hs), entt::meta_type{}); @@ -114,8 +110,8 @@ TEST_F(MetaFactory, Type) { ENTT_DEBUG_TEST_F(MetaFactoryDeathTest, Type) { using namespace entt::literals; - auto factory = entt::meta(); - auto other = entt::meta(); + entt::meta_factory factory{}; + entt::meta_factory other{}; factory.type("foo"_hs); @@ -123,7 +119,7 @@ ENTT_DEBUG_TEST_F(MetaFactoryDeathTest, Type) { } TEST_F(MetaFactory, Base) { - auto factory = entt::meta(); + entt::meta_factory factory{}; decltype(std::declval().base()) range{}; ASSERT_NE(entt::resolve(entt::type_id()), entt::meta_type{}); @@ -145,7 +141,7 @@ TEST_F(MetaFactory, Base) { TEST_F(MetaFactory, Conv) { const clazz instance{3}; - auto factory = entt::meta(); + entt::meta_factory factory{}; const entt::meta_any any = entt::forward_as_meta(instance); ASSERT_FALSE(any.allow_cast()); @@ -161,7 +157,7 @@ TEST_F(MetaFactory, Conv) { TEST_F(MetaFactory, Ctor) { const std::array values{1, 3}; - auto factory = entt::meta(); + entt::meta_factory factory{}; ASSERT_FALSE(entt::resolve().construct(values[0u])); ASSERT_FALSE(entt::resolve().construct(std::to_string(values[1u]))); @@ -181,7 +177,7 @@ TEST_F(MetaFactory, Ctor) { TEST_F(MetaFactory, Dtor) { bool check = false; - auto factory = entt::meta(); + entt::meta_factory factory{}; entt::meta_any any{std::in_place_type, check}; any.reset(); @@ -199,7 +195,7 @@ TEST_F(MetaFactory, DataMemberObject) { using namespace entt::literals; base instance{'c'}; - auto factory = entt::meta(); + entt::meta_factory factory{}; entt::meta_type type = entt::resolve(); ASSERT_FALSE(type.data("member"_hs)); @@ -217,7 +213,7 @@ TEST_F(MetaFactory, DataMemberObject) { TEST_F(MetaFactory, DataPointer) { using namespace entt::literals; - auto factory = entt::meta(); + entt::meta_factory factory{}; entt::meta_type type = entt::resolve(); ASSERT_FALSE(type.data("value"_hs)); @@ -235,7 +231,7 @@ TEST_F(MetaFactory, DataValue) { using namespace entt::literals; constexpr int value = 1; - auto factory = entt::meta(); + entt::meta_factory factory{}; entt::meta_type type = entt::resolve(); ASSERT_FALSE(type.data("value"_hs)); @@ -252,7 +248,7 @@ TEST_F(MetaFactory, DataGetterOnly) { using namespace entt::literals; clazz instance{1}; - auto factory = entt::meta(); + entt::meta_factory factory{}; entt::meta_type type = entt::resolve(); ASSERT_FALSE(type.data("value"_hs)); @@ -271,7 +267,7 @@ TEST_F(MetaFactory, DataSetterGetter) { using namespace entt::literals; clazz instance{1}; - auto factory = entt::meta(); + entt::meta_factory factory{}; entt::meta_type type = entt::resolve(); ASSERT_FALSE(type.data("value"_hs)); @@ -290,7 +286,7 @@ TEST_F(MetaFactory, DataMultiSetterGetter) { using namespace entt::literals; clazz instance{1}; - auto factory = entt::meta(); + entt::meta_factory factory{}; entt::meta_type type = entt::resolve(); ASSERT_FALSE(type.data("value"_hs)); @@ -310,7 +306,7 @@ TEST_F(MetaFactory, DataMultiSetterGetter) { TEST_F(MetaFactory, DataOverwrite) { using namespace entt::literals; - auto factory = entt::meta(); + entt::meta_factory factory{}; entt::meta_type type = entt::resolve(); ASSERT_FALSE(type.data("value"_hs)); @@ -332,7 +328,7 @@ TEST_F(MetaFactory, Func) { using namespace entt::literals; const clazz instance{1}; - auto factory = entt::meta(); + entt::meta_factory factory{}; entt::meta_type type = entt::resolve(); ASSERT_FALSE(type.func("func"_hs)); @@ -350,7 +346,7 @@ TEST_F(MetaFactory, FuncOverload) { using namespace entt::literals; clazz instance{1}; - auto factory = entt::meta(); + entt::meta_factory factory{}; entt::meta_type type = entt::resolve(); ASSERT_FALSE(type.func("func"_hs)); @@ -376,7 +372,7 @@ TEST_F(MetaFactory, FuncOverload) { TEST_F(MetaFactory, Traits) { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .data<&base::member>("member"_hs) .func<&clazz::set_int>("func"_hs) .func<&clazz::set_boxed_int>("func"_hs); @@ -388,7 +384,7 @@ TEST_F(MetaFactory, Traits) { ASSERT_EQ(type.func("func"_hs).traits(), test::meta_traits::none); ASSERT_EQ(type.func("func"_hs).next().traits(), test::meta_traits::none); - entt::meta() + entt::meta_factory{} .traits(test::meta_traits::one | test::meta_traits::three) .data<&base::member>("member"_hs) .traits(test::meta_traits::one) @@ -409,7 +405,7 @@ TEST_F(MetaFactory, Traits) { TEST_F(MetaFactory, Custom) { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .data<&base::member>("member"_hs) .func<&clazz::set_int>("func"_hs) .func<&clazz::set_boxed_int>("func"_hs); @@ -421,7 +417,7 @@ TEST_F(MetaFactory, Custom) { ASSERT_EQ(static_cast(type.func("func"_hs).custom()), nullptr); ASSERT_EQ(static_cast(type.func("func"_hs).next().custom()), nullptr); - entt::meta() + entt::meta_factory{} .custom(0) .data<&base::member>("member"_hs) .custom(1) @@ -463,8 +459,8 @@ TEST_F(MetaFactory, MetaReset) { entt::meta_ctx ctx{}; - entt::meta().type("global"_hs); - entt::meta(ctx).type("local"_hs); + entt::meta_factory{}.type("global"_hs); + entt::meta_factory{ctx}.type("local"_hs); ASSERT_TRUE(entt::resolve(entt::type_id())); ASSERT_TRUE(entt::resolve(ctx, entt::type_id())); @@ -479,8 +475,8 @@ TEST_F(MetaFactory, MetaReset) { ASSERT_FALSE(entt::resolve(entt::type_id())); ASSERT_FALSE(entt::resolve(ctx, entt::type_id())); - entt::meta().type("global"_hs); - entt::meta(ctx).type("local"_hs); + entt::meta_factory{}.type("global"_hs); + entt::meta_factory{ctx}.type("local"_hs); ASSERT_TRUE(entt::resolve(entt::type_id())); ASSERT_TRUE(entt::resolve(ctx, entt::type_id())); @@ -495,8 +491,8 @@ TEST_F(MetaFactory, MetaReset) { ASSERT_FALSE(entt::resolve(entt::type_id())); ASSERT_FALSE(entt::resolve(ctx, entt::type_id())); - entt::meta().type("global"_hs); - entt::meta(ctx).type("local"_hs); + entt::meta_factory{}.type("global"_hs); + entt::meta_factory{ctx}.type("local"_hs); ASSERT_TRUE(entt::resolve(entt::type_id())); ASSERT_TRUE(entt::resolve(ctx, entt::type_id())); diff --git a/test/entt/meta/meta_func.cpp b/test/entt/meta/meta_func.cpp index e9e6901ea..5bce15fc0 100644 --- a/test/entt/meta/meta_func.cpp +++ b/test/entt/meta/meta_func.cpp @@ -93,24 +93,24 @@ struct MetaFunc: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("double"_hs) .func<&double_member>("member"_hs); - entt::meta() + entt::meta_factory{} .type("base"_hs) .func<&base::setter>("setter"_hs) .func("fake_member"_hs) .func("fake_const_member"_hs); - entt::meta() + entt::meta_factory{} .type("derived"_hs) .base() .func<&base::setter>("setter_from_base"_hs) .func<&base::getter>("getter_from_base"_hs) .func<&base::static_setter>("static_setter_from_base"_hs); - entt::meta() + entt::meta_factory{} .type("func"_hs) .func<&entt::registry::emplace_or_replace, entt::as_ref_t>("emplace"_hs) .traits(test::meta_traits::one | test::meta_traits::two | test::meta_traits::three) @@ -175,7 +175,7 @@ ENTT_DEBUG_TEST_F(MetaFuncDeathTest, UserTraits) { using traits_type = entt::internal::meta_traits; constexpr auto value = traits_type{static_cast>(traits_type::_user_defined_traits) + 1u}; - ASSERT_DEATH(entt::meta().func<&function::g>("g"_hs).traits(value), ""); + ASSERT_DEATH(entt::meta_factory{}.func<&function::g>("g"_hs).traits(value), ""); } TEST_F(MetaFunc, Custom) { @@ -591,7 +591,7 @@ TEST_F(MetaFunc, Overloaded) { ASSERT_FALSE(type.func("f2"_hs).next()); - entt::meta() + entt::meta_factory{} // this should not overwrite traits and custom data .func(&function::f)>("f2"_hs) // this should put traits and custom data on the new overload instead @@ -615,7 +615,7 @@ TEST_F(MetaFunc, Overloaded) { TEST_F(MetaFunc, OverloadedOrder) { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .func(&function::f)>("f2"_hs) .func(&function::f)>("f2"_hs); @@ -655,7 +655,7 @@ TEST_F(MetaFunc, ReRegistration) { ASSERT_TRUE(type.invoke("f1"_hs, instance, 0)); ASSERT_FALSE(type.invoke("f1"_hs, instance, 0, 0)); - entt::meta() + entt::meta_factory{} .func(&function::f)>("f"_hs) .func(&function::f)>("f"_hs); @@ -666,7 +666,7 @@ TEST_F(MetaFunc, ReRegistration) { ASSERT_TRUE(type.invoke("f"_hs, instance, 0)); ASSERT_TRUE(type.invoke("f"_hs, instance, 0, 0)); - entt::meta() + entt::meta_factory{} .func(&function::f)>("f"_hs) .traits(test::meta_traits::one) .custom(3) diff --git a/test/entt/meta/meta_handle.cpp b/test/entt/meta/meta_handle.cpp index 55c9ec7f9..cfc8cc53b 100644 --- a/test/entt/meta/meta_handle.cpp +++ b/test/entt/meta/meta_handle.cpp @@ -20,7 +20,7 @@ struct MetaHandle: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("clazz"_hs) .func<&clazz::incr>("incr"_hs) .func<&clazz::decr>("decr"_hs); diff --git a/test/entt/meta/meta_range.cpp b/test/entt/meta/meta_range.cpp index f30a71d94..50a9d57c5 100644 --- a/test/entt/meta/meta_range.cpp +++ b/test/entt/meta/meta_range.cpp @@ -12,7 +12,9 @@ struct MetaRange: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta().type("int"_hs).data<2>("answer"_hs); + entt::meta_factory{} + .type("int"_hs) + .data<2>("answer"_hs); } void TearDown() override { @@ -73,7 +75,7 @@ TEST_F(MetaRange, Iterator) { ASSERT_GT(end, begin); ASSERT_GE(end, range.end()); - entt::meta().type("double"_hs); + entt::meta_factory{}.type("double"_hs); range = entt::resolve(); begin = range.begin(); diff --git a/test/entt/meta/meta_type.cpp b/test/entt/meta/meta_type.cpp index 36ed3b3cb..2fe4f9b08 100644 --- a/test/entt/meta/meta_type.cpp +++ b/test/entt/meta/meta_type.cpp @@ -105,37 +105,37 @@ struct MetaType: ::testing::Test { void SetUp() override { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("double"_hs) .traits(test::meta_traits::one) .data, get>("var"_hs); - entt::meta() + entt::meta_factory{} .type("unsigned int"_hs) .traits(test::meta_traits::two) .data<0u>("min"_hs) .data<128u>("max"_hs); - entt::meta() + entt::meta_factory{} .type("base"_hs) .data<&base::value>("value"_hs); - entt::meta() + entt::meta_factory{} .type("derived"_hs) .traits(test::meta_traits::one | test::meta_traits::three) .base(); - entt::meta() + entt::meta_factory{} .type("abstract"_hs) .func<&abstract::func>("func"_hs) .func<&abstract::base_only>("base_only"_hs); - entt::meta() + entt::meta_factory{} .type("concrete"_hs) .base() .base(); - entt::meta() + entt::meta_factory{} .type("overloaded_func"_hs) .func(&overloaded_func::f)>("f"_hs) .func(&overloaded_func::f)>("f"_hs) @@ -143,14 +143,14 @@ struct MetaType: ::testing::Test { .func(&overloaded_func::f)>("f"_hs) .func(&overloaded_func::f)>("f"_hs); - entt::meta() + entt::meta_factory{} .type("property"_hs) .traits(test::meta_traits::two | test::meta_traits::three) .data("value"_hs) .data("other"_hs) .data, get>("var"_hs); - entt::meta() + entt::meta_factory{} .type("class"_hs) .custom('c') .ctor() @@ -202,7 +202,7 @@ TEST_F(MetaType, UserTraits) { ENTT_DEBUG_TEST_F(MetaTypeDeathTest, UserTraits) { using traits_type = entt::internal::meta_traits; constexpr auto value = traits_type{static_cast>(traits_type::_user_defined_traits) + 1u}; - ASSERT_DEATH(entt::meta().traits(value), ""); + ASSERT_DEATH(entt::meta_factory{}.traits(value), ""); } TEST_F(MetaType, Custom) { @@ -602,7 +602,7 @@ TEST_F(MetaType, Reset) { // implicitly generated default constructor is not cleared ASSERT_TRUE(entt::resolve().construct()); - entt::meta().type("class"_hs); + entt::meta_factory{}.type("class"_hs); ASSERT_TRUE(entt::resolve("class"_hs)); } @@ -735,7 +735,7 @@ TEST_F(MetaType, ResetAndReRegistrationAfterReset) { ASSERT_FALSE(entt::resolve().data("value"_hs)); ASSERT_FALSE(entt::resolve().func("member"_hs)); - entt::meta().type("double"_hs); + entt::meta_factory{}.type("double"_hs); entt::meta_any any{3.}; ASSERT_TRUE(any); @@ -745,14 +745,14 @@ TEST_F(MetaType, ResetAndReRegistrationAfterReset) { ASSERT_FALSE(entt::resolve("derived"_hs)); ASSERT_TRUE(entt::resolve("double"_hs)); - entt::meta() + entt::meta_factory{} .traits(test::meta_traits::one) .custom(3) // this should not overwrite traits and custom data .type("base"_hs); // this should not overwrite traits and custom data - [[maybe_unused]] auto factory = entt::meta(); + [[maybe_unused]] entt::meta_factory factory{}; ASSERT_EQ(entt::resolve().traits(), test::meta_traits::one); ASSERT_NE(static_cast(entt::resolve("base"_hs).custom()), nullptr); @@ -776,13 +776,13 @@ TEST_F(MetaType, ReRegistration) { ASSERT_EQ(count, 0); ASSERT_TRUE(entt::resolve("double"_hs)); - entt::meta() + entt::meta_factory{} .type("real"_hs) .traits(test::meta_traits::one) .custom(3); // this should not overwrite traits and custom data - entt::meta().type("real"_hs); + entt::meta_factory{}.type("real"_hs); ASSERT_FALSE(entt::resolve("double"_hs)); ASSERT_TRUE(entt::resolve("real"_hs)); @@ -795,10 +795,10 @@ TEST_F(MetaType, ReRegistration) { TEST_F(MetaType, NameCollision) { using namespace entt::literals; - ASSERT_NO_THROW(entt::meta().type("class"_hs)); + ASSERT_NO_THROW(entt::meta_factory{}.type("class"_hs)); ASSERT_TRUE(entt::resolve("class"_hs)); - ASSERT_NO_THROW(entt::meta().type("quux"_hs)); + ASSERT_NO_THROW(entt::meta_factory{}.type("quux"_hs)); ASSERT_FALSE(entt::resolve("class"_hs)); ASSERT_TRUE(entt::resolve("quux"_hs)); } @@ -806,5 +806,5 @@ TEST_F(MetaType, NameCollision) { ENTT_DEBUG_TEST_F(MetaTypeDeathTest, NameCollision) { using namespace entt::literals; - ASSERT_DEATH(entt::meta().type("abstract"_hs), ""); + ASSERT_DEATH(entt::meta_factory{}.type("abstract"_hs), ""); } diff --git a/test/example/entity_copy.cpp b/test/example/entity_copy.cpp index fc754e71f..838d00515 100644 --- a/test/example/entity_copy.cpp +++ b/test/example/entity_copy.cpp @@ -29,7 +29,7 @@ meta_mixin::meta_mixin(const allocator_type &allocator) : Type{allocator} { using namespace entt::literals; - entt::meta() + entt::meta_factory{} // cross registry, same type .template func &(const entt::id_type)>(&entt::basic_registry::storage), entt::as_ref_t>("storage"_hs) // cross registry, different types diff --git a/test/lib/meta/plugin/plugin.cpp b/test/lib/meta/plugin/plugin.cpp index 40fe7869b..dc7cd3861 100644 --- a/test/lib/meta/plugin/plugin.cpp +++ b/test/lib/meta/plugin/plugin.cpp @@ -15,12 +15,12 @@ test::boxed_int create_boxed_int(int value) { void set_up() { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("boxed_int"_hs) .ctor<&create_boxed_int>() .data<&test::boxed_int::value>("value"_hs); - entt::meta() + entt::meta_factory{} .type("empty"_hs) .ctor<>(); } diff --git a/test/lib/meta/plugin_std/plugin.cpp b/test/lib/meta/plugin_std/plugin.cpp index 40fe7869b..dc7cd3861 100644 --- a/test/lib/meta/plugin_std/plugin.cpp +++ b/test/lib/meta/plugin_std/plugin.cpp @@ -15,12 +15,12 @@ test::boxed_int create_boxed_int(int value) { void set_up() { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("boxed_int"_hs) .ctor<&create_boxed_int>() .data<&test::boxed_int::value>("value"_hs); - entt::meta() + entt::meta_factory{} .type("empty"_hs) .ctor<>(); } diff --git a/test/lib/meta/shared/lib.cpp b/test/lib/meta/shared/lib.cpp index 8c69e37e8..be9dc6790 100644 --- a/test/lib/meta/shared/lib.cpp +++ b/test/lib/meta/shared/lib.cpp @@ -18,16 +18,16 @@ ENTT_API void share(const entt::locator::node_type &handle) { ENTT_API void set_up() { using namespace entt::literals; - entt::meta() + entt::meta_factory{} .type("boxed_int"_hs) .ctor<&create_boxed_int>() .data<&test::boxed_int::value>("value"_hs); - entt::meta() + entt::meta_factory{} .type("empty"_hs) .ctor<>(); - static_cast(entt::meta()); + static_cast(entt::meta_factory{}); } ENTT_API void tear_down() {