diff options
| author | iignatev <igor.ignatyev@oracle.com> | 2016-10-17 20:42:18 +0300 |
|---|---|---|
| committer | iignatyev <igor.ignatyev@oracle.com> | 2016-10-17 20:49:59 +0300 |
| commit | 7fbc5986cc49ce9bd34fba3856214c9ef28b033e (patch) | |
| tree | fe87d6e58f75fbe7fbb41f6f94fbc2f076c81c30 | |
| parent | ecd530865cefdfa7dea58e84f6aa1b548950363d (diff) | |
| download | googletest-7fbc5986cc49ce9bd34fba3856214c9ef28b033e.tar.gz googletest-7fbc5986cc49ce9bd34fba3856214c9ef28b033e.tar.bz2 googletest-7fbc5986cc49ce9bd34fba3856214c9ef28b033e.zip | |
enable null detection on Solaris Studio 12u4+
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 860aaaf5..1f10b97c 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -2184,12 +2184,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 |