Merge pull request #1647 from duxiuxing/googletest_for_asam

VS2005 with SP1(_MSC_VER=1400) already supports __pragma
7 years ago · 41f0e24335
parent 7eae4ea4e1 d91b0de99e
commit 41f0e24335
1 changed files with 1 additions and 1 deletions
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@ -313,7 +313,7 @@
 //   GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385)
 //   /* code that triggers warnings C4800 and C4385 */
 //   GTEST_DISABLE_MSC_WARNINGS_POP_()
-#if _MSC_VER >= 1500
+#if _MSC_VER >= 1400
 # define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
    __pragma(warning(push))                        \
    __pragma(warning(disable: warnings))