diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-14 01:34:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 01:34:10 (GMT) |
| commit | 673c975a963f356b19fea90cb57b69192253da2a (patch) | |
| tree | f35c7a5d70286a39ced72074c90a2b20d04d868a /googletest | |
| parent | 9816b96a6ddc0430671693df90192bbee57108b6 (diff) | |
| parent | 7fbc5986cc49ce9bd34fba3856214c9ef28b033e (diff) | |
| download | googletest-673c975a963f356b19fea90cb57b69192253da2a.zip googletest-673c975a963f356b19fea90cb57b69192253da2a.tar.gz googletest-673c975a963f356b19fea90cb57b69192253da2a.tar.bz2 | |
Merge pull request #905 from iignatev/master
enable null detection on Solaris Studio 12u4+
Diffstat (limited to 'googletest')
| -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 c2f9e3c..448c4c8 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -2210,12 +2210,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 |