fix type traits for inline namespaces

get_type_name result may not contain inline namespace v1::

Author: thorsten-klein

include/GUnit/Detail/TypeTraits.h

@@ -154,17 +154,36 @@ auto get_type_name_impl(const char *ptr, std::index_sequence<Ns...>) {
   return str;
 }
 
+constexpr bool const_strncmp(const char* a, const char*b, uint8_t n)
+{
+    bool retval = 1;
+
+    for(uint8_t i = 0; i<n; i++)
+    {
+        if(a[i] != b[i])
+        {
+            retval = 0;
+            break;
+        }
+    }
+    return retval;
+}
+
 template <class T>
 const char *get_type_name() {
+
 #if defined(__clang__)
-  return get_type_name_impl<T, 54>(
-      __PRETTY_FUNCTION__,
-      std::make_index_sequence<sizeof(__PRETTY_FUNCTION__) - 54 - 2>{});
+    constexpr char opt1[] = "const char *testing::v1::detail::get_type_name() [T = ";
+    constexpr char opt2[] = "const char *testing::detail::get_type_name() [T = ";
+    constexpr uint16_t offset = const_strncmp(__PRETTY_FUNCTION__, opt1, sizeof(opt1)-1)? sizeof(opt1)-1 : sizeof(opt2)-1;
 #elif defined(__GNUC__)
-  return get_type_name_impl<T, 59>(
-      __PRETTY_FUNCTION__,
-      std::make_index_sequence<sizeof(__PRETTY_FUNCTION__) - 59 - 2>{});
+    constexpr uint16_t offset = sizeof("const char* testing::v1::detail::get_type_name() [with T = ") - 1;
 #endif
+    constexpr auto length = sizeof(__PRETTY_FUNCTION__) - offset - 2; // " ]" in the end has length 2
+
+    return get_type_name_impl<T, offset>(
+        __PRETTY_FUNCTION__,
+        std::make_index_sequence<length>{});
 }
 
 }  // namespace detail

test/Detail/TypeTraits.cpp

@@ -8,6 +8,8 @@
 #include "GUnit/Detail/TypeTraits.h"
 #include <gtest/gtest.h>
 
+#include <algorithm>
+
 struct a {};
 
 namespace testing {
@@ -136,7 +138,13 @@ TEST(TypeTraits, ShouldGetTypeName) {
   EXPECT_STREQ("int", get_type_name<int>());
   EXPECT_STREQ("const double", get_type_name<const double>());
   EXPECT_STREQ("a", get_type_name<a>());
+#if defined(__clang__)
+  std::vector<std::string> expected = {"testing::v1::detail::n","testing::detail::n"}; // get_type_name result may not contain v1::
+  EXPECT_TRUE( std::find(expected.begin(), expected.end(), get_type_name<n>()) != expected.end() );
+#elif defined(__GNUC__)
   EXPECT_STREQ("testing::v1::detail::n", get_type_name<n>());
+#endif
+//  EXPECT_STREQ("a", "b");
 }
 }  // detail
 }  // v1