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

Fixes the "passing non-POD to ellipsis" warning in Sun Studio. Based on Alexander Demin's patch.

Browse Source
This commit is contained in:
zhanyong.wan 2009-12-07 20:45:16 +00:00
parent 891b3716c4
commit 44bafcb62d
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/gtest/internal/gtest-internal.h
View File

@ -148,17 +148,14 @@ char (&IsNullLiteralHelper(...))[2]; // NOLINT
// A compile-time bool constant that is true if and only if x is a // A compile-time bool constant that is true if and only if x is a
// null pointer literal (i.e. NULL or any 0-valued compile-time // null pointer literal (i.e. NULL or any 0-valued compile-time
// integral constant). // integral constant).
#ifdef GTEST_ELLIPSIS_NEEDS_COPY_ #ifdef GTEST_ELLIPSIS_NEEDS_POD_
// Passing non-POD classes through ellipsis (...) crashes the ARM // We lose support for NULL detection where the compiler doesn't like
// compiler. The Nokia Symbian and the IBM XL C/C++ compiler try to // passing non-POD classes through ellipsis (...).
// instantiate a copy constructor for objects passed through ellipsis
// (...), failing for uncopyable objects. Hence we define this to
// false (and lose support for NULL detection).
#define GTEST_IS_NULL_LITERAL_(x) false #define GTEST_IS_NULL_LITERAL_(x) false
#else #else
#define GTEST_IS_NULL_LITERAL_(x) \ #define GTEST_IS_NULL_LITERAL_(x) \
(sizeof(::testing::internal::IsNullLiteralHelper(x)) == 1) (sizeof(::testing::internal::IsNullLiteralHelper(x)) == 1)
#endif // GTEST_ELLIPSIS_NEEDS_COPY_ #endif // GTEST_ELLIPSIS_NEEDS_POD_
// Appends the user-supplied message to the Google-Test-generated message. // Appends the user-supplied message to the Google-Test-generated message.
String AppendUserMessage(const String& gtest_msg, String AppendUserMessage(const String& gtest_msg,

19
include/gtest/internal/gtest-port.h
View File

@ -787,22 +787,23 @@ size_t GetThreadCount();
// Therefore Google Test is not thread-safe. // Therefore Google Test is not thread-safe.
#define GTEST_IS_THREADSAFE 0 #define GTEST_IS_THREADSAFE 0
#if defined(__SYMBIAN32__) || defined(__IBMCPP__)
// Passing non-POD classes through ellipsis (...) crashes the ARM // Passing non-POD classes through ellipsis (...) crashes the ARM
// compiler. The Nokia Symbian and the IBM XL C/C++ compiler try to // compiler and generates a warning in Sun Studio. The Nokia Symbian
// instantiate a copy constructor for objects passed through ellipsis // and the IBM XL C/C++ compiler try to instantiate a copy constructor
// (...), failing for uncopyable objects. We define this to indicate // for objects passed through ellipsis (...), failing for uncopyable
// the fact. // objects. We define this to ensure that only POD is passed through
#define GTEST_ELLIPSIS_NEEDS_COPY_ 1 // ellipsis on these systems.
#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || defined(__SUNPRO_CC)
#define GTEST_ELLIPSIS_NEEDS_POD_ 1
#endif
// The Nokia Symbian and IBM XL C/C++ compilers cannot decide between // The Nokia Symbian and IBM XL C/C++ compilers cannot decide between
// const T& and const T* in a function template. These compilers // const T& and const T* in a function template. These compilers
// _can_ decide between class template specializations for T and T*, // _can_ decide between class template specializations for T and T*,
// so a tr1::type_traits-like is_pointer works. // so a tr1::type_traits-like is_pointer works.
#if defined(__SYMBIAN32__) || defined(__IBMCPP__)
#define GTEST_NEEDS_IS_POINTER_ 1 #define GTEST_NEEDS_IS_POINTER_ 1
#endif
#endif // defined(__SYMBIAN32__) || defined(__IBMCPP__)
template <bool bool_value> template <bool bool_value>
struct bool_constant { struct bool_constant {