diff options
| author | Robin Lindén <dev@robinlinden.eu> | 2018-11-10 15:40:57 +0100 |
|---|---|---|
| committer | Robin Lindén <dev@robinlinden.eu> | 2018-11-10 15:40:57 +0100 |
| commit | a3a42514f1a9fb63db67efaa0e1eed6fe29b3792 (patch) | |
| tree | da2bcec3437d23a5ff953ee4339c4e46071633df | |
| parent | c43603f288f40f21998a98f7e74c4206323f417e (diff) | |
| download | googletest-a3a42514f1a9fb63db67efaa0e1eed6fe29b3792.tar.gz googletest-a3a42514f1a9fb63db67efaa0e1eed6fe29b3792.tar.bz2 googletest-a3a42514f1a9fb63db67efaa0e1eed6fe29b3792.zip | |
Define GTEST_DISABLE_MSC_WARNINGS_PUSH/POP for all compilers
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 998be27b..ff1a3365 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -310,6 +310,10 @@ __pragma(warning(disable: warnings)) # define GTEST_DISABLE_MSC_WARNINGS_POP_() \ __pragma(warning(pop)) +#else +// Not all compilers are MSVC +# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) +# define GTEST_DISABLE_MSC_WARNINGS_POP_() #endif // Clang on Windows does not understand MSVC's pragma warning. |