diff --git a/develop/singles/headers/meta.hpp/meta_all.hpp b/develop/singles/headers/meta.hpp/meta_all.hpp index a79c8aa..d8b0b38 100644 --- a/develop/singles/headers/meta.hpp/meta_all.hpp +++ b/develop/singles/headers/meta.hpp/meta_all.hpp @@ -5130,14 +5130,6 @@ namespace meta_hpp inline arguments_bind arguments_() { return arguments_bind{}; } - - inline arguments_bind argument_(std::string name) { - return arguments_()(std::move(name)); - } - - inline arguments_bind argument_(std::string name, metadata_map metadata) { - return arguments_()(std::move(name), std::move(metadata)); - } } namespace meta_hpp @@ -5211,10 +5203,6 @@ namespace meta_hpp inline metadata_bind metadata_() { return metadata_bind{}; } - - inline metadata_bind metadata_(std::string name, uvalue value) { - return metadata_()(std::move(name), std::move(value)); - } } namespace meta_hpp diff --git a/develop/untests/meta_states/metadata_tests.cpp b/develop/untests/meta_states/metadata_tests.cpp index d4fac8e..45906f6 100644 --- a/develop/untests/meta_states/metadata_tests.cpp +++ b/develop/untests/meta_states/metadata_tests.cpp @@ -96,8 +96,9 @@ TEST_CASE("meta/meta_states/metadata/class") { ("v", meta::metadata_()("desc", "the ctor arg"s)), meta::metadata_()("desc", "one arg 2d vector ctor"s)) .constructor_( - meta::argument_("x", meta::metadata_("desc", "the 1st ctor arg"s)), - meta::argument_("y", meta::metadata_("desc", "the 2nd ctor arg"s)), + meta::arguments_() + ("x", meta::metadata_()("desc", "the 1st ctor arg"s)) + ("y", meta::metadata_()("desc", "the 2nd ctor arg"s)), meta::metadata_()("desc", "two args 2d vector ctor"s)) .member_("x", &ivec2::x, meta::metadata_()("desc", "x-member"s)) .member_("y", &ivec2::y, meta::metadata_()("desc", "y-member"s)) @@ -111,8 +112,8 @@ TEST_CASE("meta/meta_states/metadata/class") { meta::arguments_() ("r", meta::metadata_()("desc", "r-arg"s)), meta::metadata_()("desc", "iadd-function"s)) - .variable_("zero", &ivec2::zero, meta::metadata_("desc", "{0,0} vector"s)) - .variable_("unit", &ivec2::unit, meta::metadata_("desc", "{1,1} vector"s)); + .variable_("zero", &ivec2::zero, meta::metadata_()("desc", "{0,0} vector"s)) + .variable_("unit", &ivec2::unit, meta::metadata_()("desc", "{1,1} vector"s)); // metadata override diff --git a/develop/untests/meta_states/method2_tests.cpp b/develop/untests/meta_states/method2_tests.cpp index 1f51bce..6d44a4e 100644 --- a/develop/untests/meta_states/method2_tests.cpp +++ b/develop/untests/meta_states/method2_tests.cpp @@ -25,7 +25,7 @@ TEST_CASE("meta/meta_states/method2") { namespace meta = meta_hpp; meta::class_() - .method_("add", &ivec2::add, meta::argument_("other")); + .method_("add", &ivec2::add, meta::arguments_()("other")); const meta::class_type ivec2_type = meta::resolve_type(); REQUIRE(ivec2_type); diff --git a/headers/meta.hpp/meta_binds.hpp b/headers/meta.hpp/meta_binds.hpp index a21d1f7..cfe2fbd 100644 --- a/headers/meta.hpp/meta_binds.hpp +++ b/headers/meta.hpp/meta_binds.hpp @@ -411,14 +411,6 @@ namespace meta_hpp inline arguments_bind arguments_() { return arguments_bind{}; } - - inline arguments_bind argument_(std::string name) { - return arguments_()(std::move(name)); - } - - inline arguments_bind argument_(std::string name, metadata_map metadata) { - return arguments_()(std::move(name), std::move(metadata)); - } } namespace meta_hpp @@ -492,8 +484,4 @@ namespace meta_hpp inline metadata_bind metadata_() { return metadata_bind{}; } - - inline metadata_bind metadata_(std::string name, uvalue value) { - return metadata_()(std::move(name), std::move(value)); - } }