gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
tisi1988
2018-07-12 11:06:08 +02:00
committed by GitHub
parent dfddc98718 41f0e24335
commit de6e079f15
3 changed files with 351 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
googletest/include/gtest/internal/gtest-port.h
View File

@@ -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))