summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author杜修杏 <duxiuxing@foxmail.com>2018-06-29 03:19:46 (GMT)
committer杜修杏 <duxiuxing@foxmail.com>2018-06-29 03:19:46 (GMT)
commit03ea2fdecb7a4d554813ca6d38cd8c221932f9c8 (patch)
tree3c93cd876946781cebcfc7e1d73b43a05ef9d221
parentba96d0b1161f540656efdaed035b3c062b60e006 (diff)
downloadgoogletest-03ea2fdecb7a4d554813ca6d38cd8c221932f9c8.zip
googletest-03ea2fdecb7a4d554813ca6d38cd8c221932f9c8.tar.gz
googletest-03ea2fdecb7a4d554813ca6d38cd8c221932f9c8.tar.bz2
VS2005 with SP1(_MSC_VER=1400) already supports __pragma
-rw-r--r--googletest/include/gtest/internal/gtest-port.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 437a4ed..d5ec086 100644
--- 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))