sha512sum/nameof_module
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix nameofType

Browse source
This commit is contained in:
Neargye 2018-08-07 21:14:24 +05:00
parent f4675ed641
commit acf3f7faad
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/nameof.hpp
View file

@ -208,14 +208,20 @@ inline NAMEOF_CONSTEXPR14 detail::cstring Nameof(T&&, const char*, std::size_t,
template <typename T> template <typename T>
inline detail::cstring NameofTypeRaw() noexcept { inline detail::cstring NameofTypeRaw() noexcept {
#if defined(__clang__) #if defined(__clang__)
return {__PRETTY_FUNCTION__ + (sizeof("detail::cstring nameof::NameofTypeRaw() [T = ") - 1), return {__PRETTY_FUNCTION__,
(sizeof(__PRETTY_FUNCTION__) - 1) - (sizeof("detail::cstring nameof::NameofTypeRaw() [T = ") - 1) - (sizeof("]") - 1)}; sizeof(__PRETTY_FUNCTION__) - 1,
sizeof("detail::cstring nameof::NameofTypeRaw() [T = ") - 1,
sizeof("]") - 1};
#elif defined(__GNUC__) #elif defined(__GNUC__)
return {__PRETTY_FUNCTION__ + (sizeof("constexpr nameof::detail::cstring nameof::NameofTypeRaw() [with T = ") - 1), return {__PRETTY_FUNCTION__,
(sizeof(__PRETTY_FUNCTION__) - 1) - (sizeof("constexpr nameof::detail::cstring nameof::NameofTypeRaw() [with T = ") - 1) - (sizeof("]") - 1)}; sizeof(__PRETTY_FUNCTION__) - 1,
sizeof("nameof::detail::cstring nameof::NameofTypeRaw() [with T = ") - 1,
sizeof("]") - 1};
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
return {__FUNCSIG__ + (sizeof("class nameof::detail::cstring __cdecl nameof::NameofTypeRaw<") - 1), return {__FUNCSIG__,
(sizeof(__FUNCSIG__) - 1) - (sizeof("class nameof::detail::cstring __cdecl nameof::NameofTypeRaw<") - 1) - (sizeof(">(void) noexcept") - 1)}; sizeof(__FUNCSIG__) - 1,
sizeof("class nameof::detail::cstring __cdecl nameof::NameofTypeRaw<") - 1,
sizeof(">(void) noexcept") - 1};
#else #else
return {}; return {};
#endif #endif

1
test/test.cpp
View file

@ -113,6 +113,7 @@ TEST_CASE("constexpr") {
constexpr auto cx6 = NAMEOF_RAW(__cplusplus); constexpr auto cx6 = NAMEOF_RAW(__cplusplus);
static_assert(cx6 == "__cplusplus", ""); static_assert(cx6 == "__cplusplus", "");
} }
#if 0 #if 0
SECTION("NAMEOF_TYPE") { SECTION("NAMEOF_TYPE") {
SomeClass<int> a; SomeClass<int> a;