From 50ded04922a594fede82b8f37a6219aedca190f5 Mon Sep 17 00:00:00 2001
From: neargye <neargye@gmail.com>
Date: Sat, 24 Aug 2019 20:30:49 +0500
Subject: [PATCH] clean-up nameof_type_impl()

---
 include/nameof.hpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/nameof.hpp b/include/nameof.hpp
index 8822b4d..0a18ad3 100644
--- a/include/nameof.hpp
+++ b/include/nameof.hpp
@@ -201,18 +201,14 @@ template <typename E, int O, int... I>
 template <typename... T>
 [[nodiscard]] constexpr std::string_view nameof_type_impl() noexcept {
 #if defined(__clang__)
-  std::string_view name{__PRETTY_FUNCTION__ + 83, sizeof(__PRETTY_FUNCTION__) - 87};
+  return {__PRETTY_FUNCTION__ + 83, sizeof(__PRETTY_FUNCTION__) - 87 - (__PRETTY_FUNCTION__[sizeof(__PRETTY_FUNCTION__) - 5] == ' ' ? 1 : 0)};
 #elif defined(__GNUC__)
-  std::string_view name{__PRETTY_FUNCTION__ + 98, sizeof(__PRETTY_FUNCTION__) - 151};
+  return {__PRETTY_FUNCTION__ + 98, sizeof(__PRETTY_FUNCTION__) - 151 - (__PRETTY_FUNCTION__[sizeof(__PRETTY_FUNCTION__) - 54] == ' ' ? 1 : 0)};
 #elif defined(_MSC_VER)
-  std::string_view name{__FUNCSIG__ + 139, sizeof(__FUNCSIG__) - 157};
+  return {__FUNCSIG__ + 139, sizeof(__FUNCSIG__) - 157 - (__FUNCSIG__[sizeof(__FUNCSIG__) - 19] == ' ' ? 1 : 0)};
 #else
   return {}; // Unsupported compiler.
 #endif
-
-#if defined(__clang__) || defined(__GNUC__) || defined(_MSC_VER)
-  return name.substr(0, name.length() - (name.back() == ' ' ? 1 : 0));
-#endif
 }
 
 } // namespace nameof::detail