From abb5e00ccf4df7baba020e618384730aa73fbd67 Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Thu, 22 Sep 2016 15:40:35 +0300 Subject: [PATCH] 8166483: gtest fmw should be updated to support null detection on SS >= 12u4 Reviewed-by: dholmes, kzhaldyb --- test/fmw/gtest/include/gtest/internal/gtest-port.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/fmw/gtest/include/gtest/internal/gtest-port.h b/test/fmw/gtest/include/gtest/internal/gtest-port.h index dc4fe0cb6b8..b772f4bed77 100644 --- a/test/fmw/gtest/include/gtest/internal/gtest-port.h +++ b/test/fmw/gtest/include/gtest/internal/gtest-port.h @@ -1586,12 +1586,13 @@ class ThreadLocal { 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