diff options
| author | Tom Hughes <tomhughes@google.com> | 2023-03-04 00:09:49 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-03-06 15:19:04 (GMT) |
| commit | d92a270d2d9d6bb7ed3bf7dc3f698028550a65ef (patch) | |
| tree | 6c580df11af0b8cc3ba4f77ba521a71517cfa4ed /googletest/include/gtest/internal/gtest-port.h | |
| parent | 2ddba266914d6437c313d36f73a4be3a6172e638 (diff) | |
| download | googletest-d92a270d2d9d6bb7ed3bf7dc3f698028550a65ef.zip googletest-d92a270d2d9d6bb7ed3bf7dc3f698028550a65ef.tar.gz googletest-d92a270d2d9d6bb7ed3bf7dc3f698028550a65ef.tar.bz2 | |
Fix compilation with -Wundef.
Fixes #3267
PiperOrigin-RevId: 513946600
Change-Id: I0dd1daa04aeb735a238c4c0af6676565d64cbc21
Diffstat (limited to 'googletest/include/gtest/internal/gtest-port.h')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index ba90620..7253360 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -469,8 +469,12 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; // cleanups prior to that. To reliably check for C++ exception availability with // clang, check for // __EXCEPTIONS && __has_feature(cxx_exceptions). -#define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions)) -#elif defined(__GNUC__) && __EXCEPTIONS +#if defined(__EXCEPTIONS) && __EXCEPTIONS && __has_feature(cxx_exceptions) +#define GTEST_HAS_EXCEPTIONS 1 +#else +#define GTEST_HAS_EXCEPTIONS 0 +#endif +#elif defined(__GNUC__) && defined(__EXCEPTIONS) && __EXCEPTIONS // gcc defines __EXCEPTIONS to 1 if and only if exceptions are enabled. #define GTEST_HAS_EXCEPTIONS 1 #elif defined(__SUNPRO_CC) @@ -478,7 +482,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; // detecting whether they are enabled or not. Therefore, we assume that // they are enabled unless the user tells us otherwise. #define GTEST_HAS_EXCEPTIONS 1 -#elif defined(__IBMCPP__) && __EXCEPTIONS +#elif defined(__IBMCPP__) && defined(__EXCEPTIONS) && __EXCEPTIONS // xlC defines __EXCEPTIONS to 1 if and only if exceptions are enabled. #define GTEST_HAS_EXCEPTIONS 1 #elif defined(__HP_aCC) |