Merge pull request #1647 from duxiuxing/googletest_for_asam

VS2005 with SP1(_MSC_VER=1400) already supports __pragma

Merge pull request #1647 from duxiuxing/googletest_for_asam
VS2005 with SP1(_MSC_VER=1400) already supports __pragma
41f0e243 · Gennadiy Civil · GitHub · 7eae4ea4 · d91b0de9 · 41f0e243
Unverified Commit 41f0e243 authored Jul 11, 2018 by Gennadiy Civil Committed by GitHub Jul 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

googletest/include/gtest/internal/gtest-port.h googletest/include/gtest/internal/gtest-port.h +1 -1

No files found.
--- 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))