From a001ed0c033faf7dcce706408d0a00298215cde0 Mon Sep 17 00:00:00 2001 From: "kenton@google.com" Date: Mon, 1 Dec 2008 23:47:49 +0000 Subject: * Update version compatibility stuff -- 2.0.3 is in no way compatible with 2.0.2. * Minor Tru64 fix. --- src/gtest/internal/gtest-port.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gtest') 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 struct bool_constant { -- cgit v1.2.3