gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Downgrade to C++98 code.

Browse Source 
Some users are not ready for C++11 yet.
This commit is contained in:
James Dennett 2018-05-21 10:59:24 -07:00 committed by GitHub
parent 89286a4cdf
commit ec2c911b33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,12 +62,12 @@ namespace internal {
// used by various standard libraries (e.g., `std::__1`). Names outside // used by various standard libraries (e.g., `std::__1`). Names outside
// of namespace std are returned unmodified. // of namespace std are returned unmodified.
inline std::string CanonicalizeForStdLibVersioning(std::string s) { inline std::string CanonicalizeForStdLibVersioning(std::string s) {
static constexpr char prefix[] = "std::__"; static const char prefix[] = "std::__";
if (s.compare(0, strlen(prefix), prefix) == 0) { if (s.compare(0, strlen(prefix), prefix) == 0) {
auto end = s.find("::", strlen(prefix)); std::string::size_type end = s.find("::", strlen(prefix));
if (end != s.npos) { if (end != s.npos) {
// Erase the `::__` plus whatever was between that and the next `::`. // Erase everything between the initial `std` and the second `::`.
s.erase(strlen("std"), strlen("::__") + end - strlen(prefix)); s.erase(strlen("std"), end - strlen("std"));
} }
} }
return s; return s;
@ -89,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);
std::string name_str(status == 0 ? readable_name : name); const std::string name_str(status == 0 ? readable_name : name);
free(readable_name); free(readable_name);
return CanonicalizeForStdLibVersioning(std::move(name_str)); return CanonicalizeForStdLibVersioning(name_str);
# else # else
return name; return name;
# endif // GTEST_HAS_CXXABI_H_ || __HP_aCC # endif // GTEST_HAS_CXXABI_H_ || __HP_aCC