diff options
author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-12-01 23:47:49 +0000 |
---|---|---|
committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-12-01 23:47:49 +0000 |
commit | a001ed0c033faf7dcce706408d0a00298215cde0 (patch) | |
tree | a0fe6e96edbdf46265956d41c20493d6af283cae /src/gtest | |
parent | 9f1752889c7085da56a46a4f3e1947baf1a3d6ae (diff) | |
download | protobuf-a001ed0c033faf7dcce706408d0a00298215cde0.tar.gz protobuf-a001ed0c033faf7dcce706408d0a00298215cde0.tar.bz2 protobuf-a001ed0c033faf7dcce706408d0a00298215cde0.zip |
* Update version compatibility stuff -- 2.0.3 is in no way compatible with
2.0.2.
* Minor Tru64 fix.
Diffstat (limited to 'src/gtest')
-rw-r--r-- | src/gtest/internal/gtest-port.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gtest/internal/gtest-port.h b/src/gtest/internal/gtest-port.h index 9d65ec83..791dcd27 100644 --- a/src/gtest/internal/gtest-port.h +++ b/src/gtest/internal/gtest-port.h @@ -438,11 +438,11 @@ inline size_t GetThreadCount() { return 1; } // Defines tr1::is_pointer (only needed for Symbian). -#ifdef __SYMBIAN32__ +#if defined(__SYMBIAN32__) || (defined (__DECCXX) && defined(__osf__)) -// Symbian does not have tr1::type_traits, so we define our own is_pointer -// These are needed as the Nokia Symbian Compiler cannot decide between -// const T& and const T* in a function template. +// Symbian and HP C++ on Tru64 do not have tr1::type_traits, so we define +// our own is_pointer. These are needed as these compilers cannot decide +// between const T& and const T* in a function template. template <bool bool_value> struct bool_constant { |