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

Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule

Browse Source
This commit is contained in:
Gennadiy Civil 2018-01-03 14:15:14 -05:00 committed by GitHub
commit 26addade17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
googletest/include/gtest/gtest-printers.h
View File

@ -427,13 +427,8 @@ void DefaultPrintTo(WrapPrinterType<kPrintFunctionPointer> /* dummy */,
*os << "NULL"; *os << "NULL";
} else { } else {
// T is a function type, so '*os << p' doesn't do what we want // T is a function type, so '*os << p' doesn't do what we want
// (it just prints p as bool). We want to print p as a const // (it just prints p as bool). Cast p to const void* to print it.
// void*. However, we cannot cast it to const void* directly, *os << reinterpret_cast<const void*>(p);
// even using reinterpret_cast, as earlier versions of gcc
// (e.g. 3.4.5) cannot compile the cast when p is a function
// pointer. Casting to UInt64 first solves the problem.
*os << reinterpret_cast<const void*>(
reinterpret_cast<internal::UInt64>(p));
} }
} }

2
googletest/include/gtest/internal/gtest-port.h
View File

@ -827,7 +827,7 @@ using ::std::tuple_size;
// Determines whether to support Combine(). // Determines whether to support Combine().
// The implementation doesn't work on Sun Studio since it doesn't // The implementation doesn't work on Sun Studio since it doesn't
// understand templated conversion operators. // understand templated conversion operators.
#if GTEST_HAS_TR1_TUPLE && !defined(__SUNPRO_CC) #if (GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_) && !defined(__SUNPRO_CC)
# define GTEST_HAS_COMBINE 1 # define GTEST_HAS_COMBINE 1
#endif #endif