diff --git a/headers/meta.hpp/meta_types.hpp b/headers/meta.hpp/meta_types.hpp index c19fe60..2a60abf 100644 --- a/headers/meta.hpp/meta_types.hpp +++ b/headers/meta.hpp/meta_types.hpp @@ -156,8 +156,8 @@ namespace meta_hpp [[nodiscard]] const std::vector& get_argument_types() const noexcept; [[nodiscard]] const class_set& get_bases() const noexcept; - [[nodiscard]] const constructor_map& get_ctors() const noexcept; - [[nodiscard]] const destructor_map& get_dtors() const noexcept; + [[nodiscard]] const constructor_map& get_constructors() const noexcept; + [[nodiscard]] const destructor_map& get_destructors() const noexcept; [[nodiscard]] const function_map& get_functions() const noexcept; [[nodiscard]] const member_map& get_members() const noexcept; [[nodiscard]] const method_map& get_methods() const noexcept; diff --git a/headers/meta.hpp/meta_types/class_type.hpp b/headers/meta.hpp/meta_types/class_type.hpp index ede005f..a816048 100644 --- a/headers/meta.hpp/meta_types/class_type.hpp +++ b/headers/meta.hpp/meta_types/class_type.hpp @@ -77,11 +77,11 @@ namespace meta_hpp return data_->bases; } - inline const constructor_map& class_type::get_ctors() const noexcept { + inline const constructor_map& class_type::get_constructors() const noexcept { return data_->constructors; } - inline const destructor_map& class_type::get_dtors() const noexcept { + inline const destructor_map& class_type::get_destructors() const noexcept { return data_->destructors; } diff --git a/untests/meta_types/class_type_tests.cpp b/untests/meta_types/class_type_tests.cpp index f2fce15..c9a9408 100644 --- a/untests/meta_types/class_type_tests.cpp +++ b/untests/meta_types/class_type_tests.cpp @@ -183,11 +183,11 @@ TEST_CASE("meta/meta_types/class_type") { } } - SUBCASE("get_ctors") { - CHECK(base_clazz_1_type.get_ctors().size() == 1); - CHECK(base_clazz_2_type.get_ctors().size() == 1); - CHECK(derived_clazz_type.get_ctors().size() == 1); - CHECK(final_derived_clazz_type.get_ctors().size() == 1); + SUBCASE("get_constructors") { + CHECK(base_clazz_1_type.get_constructors().size() == 1); + CHECK(base_clazz_2_type.get_constructors().size() == 1); + CHECK(derived_clazz_type.get_constructors().size() == 1); + CHECK(final_derived_clazz_type.get_constructors().size() == 1); } SUBCASE("get_bases") { diff --git a/untests/meta_utilities/hash_tests.cpp b/untests/meta_utilities/hash_tests.cpp index 35cf478..405a54c 100644 --- a/untests/meta_utilities/hash_tests.cpp +++ b/untests/meta_utilities/hash_tests.cpp @@ -54,7 +54,7 @@ TEST_CASE("meta/meta_utilities/hash") { const meta::class_type ivec2_type = meta::resolve_type(); const meta::constructor ivec2_ctor = ivec2_type.get_constructor_with(); - const meta::destructor ivec2_dtor = ivec2_type.get_dtors().begin()->second; + const meta::destructor ivec2_dtor = ivec2_type.get_destructors().begin()->second; const meta::function ivec2_function = ivec2_type.get_function("iadd"); const meta::argument ivec2_function_arg = ivec2_function.get_argument(0); const meta::member ivec2_member = ivec2_type.get_member("x");