From a3a42514f1a9fb63db67efaa0e1eed6fe29b3792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20Lind=C3=A9n?= Date: Sat, 10 Nov 2018 15:40:57 +0100 Subject: [PATCH] Define GTEST_DISABLE_MSC_WARNINGS_PUSH/POP for all compilers --- googletest/include/gtest/internal/gtest-port.h | 4 ++++ 1 file changed, 4 insertions(+) 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.