From df0ea2738342c9821aaee4ff73171f7151c3b397 Mon Sep 17 00:00:00 2001 From: neargye Date: Sat, 3 Apr 2021 00:29:27 +0300 Subject: [PATCH] fix build --- example/example.cpp | 4 ++-- test/test.cpp | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/example/example.cpp b/example/example.cpp index 5f4aa75..3e62e8a 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -173,8 +173,8 @@ int main() { std::cout << nameof::nameof_member<&SomeStruct::somefield>() << std::endl; // somefield std::cout << nameof::nameof_member<&SomeStruct::SomeMethod1>() << std::endl; // SomeMethod1 std::cout << NAMEOF_MEMBER(&Long::LL::field) << std::endl; // field - constexpr auto member_ptr = &SomeStruct.somefield; - std::cout << NAMEOF_MEMBER(member_ptr) << std::endl; // field + constexpr auto member_ptr = &SomeStruct::somefield; + std::cout << NAMEOF_MEMBER(member_ptr) << std::endl; // somefield #endif // Nameof macro. diff --git a/test/test.cpp b/test/test.cpp index b40cb69..ae1ae41 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -883,19 +883,19 @@ TEST_CASE("NAMEOF_SHORT_TYPE_RTTI") { #if defined(NAMEOF_MEMBER_SUPPORTED) && NAMEOF_MEMBER_SUPPORTED TEST_CASE("NAMEOF_MEMBER") { - REQUIRE(NAMEOF_MEMBER(&SomeStruct::somefield) == "Derived"); - REQUIRE(NAMEOF_MEMBER(&SomeStruct::SomeMethod1) == "Derived"); - REQUIRE(NAMEOF_MEMBER(&Long::LL::field) == "Derived"); - constexpr auto member_ptr = &SomeStruct.somefield; - REQUIRE(NAMEOF_MEMBER(member_ptr) == "Derived"); + REQUIRE(NAMEOF_MEMBER(&SomeStruct::somefield) == "somefield"); + REQUIRE(NAMEOF_MEMBER(&SomeStruct::SomeMethod1) == "SomeMethod1"); + REQUIRE(NAMEOF_MEMBER(&Long::LL::field) == "SomeMethod1"); + constexpr auto member_ptr = &SomeStruct::somefield; + REQUIRE(NAMEOF_MEMBER(member_ptr) == "somefield"); } TEST_CASE("nameof_member") { - REQUIRE(nameof::nameof_member<&SomeStruct::somefield>() == "Derived"); - REQUIRE(nameof::nameof_member<&SomeStruct::SomeMethod1>() == "Derived"); - REQUIRE(nameof::nameof_member<&Long::LL::field>() == "Derived"); - constexpr auto member_ptr = &SomeStruct.somefield; - REQUIRE(nameof::nameof_member() == "Derived"); + REQUIRE(nameof::nameof_member<&SomeStruct::somefield>() == "somefield"); + REQUIRE(nameof::nameof_member<&SomeStruct::SomeMethod1>() == "SomeMethod1"); + REQUIRE(nameof::nameof_member<&Long::LL::field>() == "field"); + constexpr auto member_ptr = &SomeStruct::somefield; + REQUIRE(nameof::nameof_member() == "somefield"); } #endif