diff options
Diffstat (limited to 'src/gtest/internal')
| -rw-r--r-- | src/gtest/internal/gtest-internal.h | 12 | ||||
| -rw-r--r-- | src/gtest/internal/gtest-port.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/gtest/internal/gtest-internal.h b/src/gtest/internal/gtest-internal.h index 2be1b4ac..883981f6 100644 --- a/src/gtest/internal/gtest-internal.h +++ b/src/gtest/internal/gtest-internal.h @@ -210,12 +210,13 @@ String StreamableToString(const T& streamable); // Formats a value to be used in a failure message. -#ifdef __SYMBIAN32__ +#if defined (__SYMBIAN32__) || (defined (__DECCXX) && defined(__osf__)) -// These are needed as the Nokia Symbian Compiler cannot decide between -// const T& and const T* in a function template. The Nokia compiler _can_ -// decide between class template specializations for T and T*, so a -// tr1::type_traits-like is_pointer works, and we can overload on that. +// These are needed as the Nokia Symbian Compiler and HP C++ on Tru64 +// cannot decide between const T& and const T* in a function template. +// These compliers _can_ decide between class template specializations +// for T and T*, so a tr1::type_traits-like is_pointer works, and we +// can overload on that. // This overload makes sure that all pointers (including // those to char or wchar_t) are printed as raw pointers. @@ -255,7 +256,6 @@ inline String FormatForFailureMessage(T* pointer) { // These overloaded versions handle narrow and wide characters. String FormatForFailureMessage(char ch); -String FormatForFailureMessage(wchar_t wchar); // When this operand is a const char* or char*, and the other operand // is a ::std::string or ::string, we print this operand as a C string diff --git a/src/gtest/internal/gtest-port.h b/src/gtest/internal/gtest-port.h index 36d5a149..9d65ec83 100644 --- a/src/gtest/internal/gtest-port.h +++ b/src/gtest/internal/gtest-port.h @@ -223,10 +223,10 @@ // struct Foo { // Foo() { ... } // } GTEST_ATTRIBUTE_UNUSED; -#if defined(GTEST_OS_WINDOWS) || (defined(GTEST_OS_LINUX) && defined(SWIG)) -#define GTEST_ATTRIBUTE_UNUSED -#else +#ifdef __GNUC__ #define GTEST_ATTRIBUTE_UNUSED __attribute__ ((unused)) +#else +#define GTEST_ATTRIBUTE_UNUSED #endif // GTEST_OS_WINDOWS || (GTEST_OS_LINUX && SWIG) // A macro to disallow the evil copy constructor and operator= functions |