OpenJDK / amber / amber
changeset 41266:287d428e24a8
Merge
| author | dlong |
|---|---|
| date | Mon, 26 Sep 2016 14:21:20 -0400 |
| parents | 4499c77553f4 4bb69cdad04b |
| children | 13c756f4eff5 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/test/fmw/gtest/include/gtest/internal/gtest-port.h Tue Sep 20 16:34:44 2016 -0400 +++ b/test/fmw/gtest/include/gtest/internal/gtest-port.h Mon Sep 26 14:21:20 2016 -0400 @@ -1586,12 +1586,13 @@ GTEST_API_ size_t GetThreadCount(); // Passing non-POD classes through ellipsis (...) crashes the ARM -// compiler and generates a warning in Sun Studio. The Nokia Symbian +// compiler and generates a warning in Sun Studio before 12u4. The Nokia Symbian // and the IBM XL C/C++ compiler try to instantiate a copy constructor // for objects passed through ellipsis (...), failing for uncopyable // objects. We define this to ensure that only POD is passed through // ellipsis on these systems. -#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || defined(__SUNPRO_CC) +#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || \ + (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x5130) // We lose support for NULL detection where the compiler doesn't like // passing non-POD classes through ellipsis (...). # define GTEST_ELLIPSIS_NEEDS_POD_ 1