Skip to content

G
googletest
Unverified Commit 41f0e243 by Gennadiy Civil Committed by GitHub
Options

Merge pull request #1647 from duxiuxing/googletest_for_asam

VS2005 with SP1(_MSC_VER=1400) already supports __pragma
parents 7eae4ea4 d91b0de9
Showing with 1 addition and 1 deletion
googletest/include/gtest/internal/gtest-port.h
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
// GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385) // GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385)
// /* code that triggers warnings C4800 and C4385 */ // /* code that triggers warnings C4800 and C4385 */
// GTEST_DISABLE_MSC_WARNINGS_POP_() // GTEST_DISABLE_MSC_WARNINGS_POP_()
#if _MSC_VER >= 1500 #if _MSC_VER >= 1400
# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \ # define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
__pragma(warning(push)) \ __pragma(warning(push)) \
__pragma(warning(disable: warnings)) __pragma(warning(disable: warnings))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment