diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-11 12:00:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-11 12:00:02 -0400 |
| commit | 41f0e24335d8874cc87420a6349bb1844e2a15de (patch) | |
| tree | 02e4477459fe72b99053ff408dd239409548538f | |
| parent | 7eae4ea4e149163cd57aea25e4769449f9d351e6 (diff) | |
| parent | d91b0de99e5b325e6042c51921696dcfbf6ef485 (diff) | |
| download | googletest-41f0e24335d8874cc87420a6349bb1844e2a15de.tar.gz googletest-41f0e24335d8874cc87420a6349bb1844e2a15de.tar.bz2 googletest-41f0e24335d8874cc87420a6349bb1844e2a15de.zip | |
Merge pull request #1647 from duxiuxing/googletest_for_asam
VS2005 with SP1(_MSC_VER=1400) already supports __pragma
| -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 437a4ed7..d5ec0864 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)) |