generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update generated code.

Browse Source
This commit is contained in:
James Dennett 2018-05-10 22:36:50 -07:00 committed by GitHub
parent b8fa4d2754
commit fc66ae45fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
googletest/include/gtest/internal/gtest-type-util.h
View File

@ -56,6 +56,22 @@
namespace testing { namespace testing {
namespace internal { namespace internal {
// Canonicalizes a given name with respect to the Standard C++ Library.
// This handles removing the inline namespace within `std` that is
// used by various standard libraries (e.g., `std::__1`). Names outside
// of namespace std are returned unmodified.
inline std::string CanonicalizeForStdLibVersioning(std::string s) {
static constexpr char prefix[] = "std::__";
if (s.compare(0, strlen(prefix), prefix) == 0) {
auto end = s.find("::", strlen(prefix));
if (end != s.npos) {
// Erase the `::__` plus whatever was between that and the next `::`.
s.erase(strlen("std"), strlen("::__") + end - strlen(prefix));
}
}
return s;
}
// GetTypeName<T>() returns a human-readable name of type T. // GetTypeName<T>() returns a human-readable name of type T.
// NB: This function is also used in Google Mock, so don't move it inside of // NB: This function is also used in Google Mock, so don't move it inside of
@ -73,9 +89,9 @@ std::string GetTypeName() {
using abi::__cxa_demangle; using abi::__cxa_demangle;
# endif // GTEST_HAS_CXXABI_H_ # endif // GTEST_HAS_CXXABI_H_
char* const readable_name = __cxa_demangle(name, 0, 0, &status); char* const readable_name = __cxa_demangle(name, 0, 0, &status);
const std::string name_str(status == 0 ? readable_name : name); std::string name_str(status == 0 ? readable_name : name);
free(readable_name); free(readable_name);
return name_str; return CanonicalizeForStdLibVersioning(std::move(name_str));
# else # else
return name; return name;
# endif // GTEST_HAS_CXXABI_H_ || __HP_aCC # endif // GTEST_HAS_CXXABI_H_ || __HP_aCC