diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-07-12 09:06:08 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-12 09:06:08 (GMT) |
| commit | de6e079f15b0d1988033fc8203d172f493d08506 (patch) | |
| tree | de17888c681f35e5cf984fe70006507f7b331fc8 /googletest/include | |
| parent | dfddc987186100c98d93a830d6ca88fa66ab3dbc (diff) | |
| parent | 41f0e24335d8874cc87420a6349bb1844e2a15de (diff) | |
| download | googletest-de6e079f15b0d1988033fc8203d172f493d08506.zip googletest-de6e079f15b0d1988033fc8203d172f493d08506.tar.gz googletest-de6e079f15b0d1988033fc8203d172f493d08506.tar.bz2 | |
Merge branch 'master' into master
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
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 08c5049..f07b69e 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)) |