diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 19:33:56 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 19:33:56 (GMT) |
| commit | 57d6e824b44be45a084fe6baffdfc27b8f8d623f (patch) | |
| tree | c001a0b5d0fff558606c8343818e76768eab34e0 /googletest/include/gtest/gtest.h | |
| parent | 44da2b9ac5dff919966d7bf488c7058bc8563023 (diff) | |
| download | googletest-57d6e824b44be45a084fe6baffdfc27b8f8d623f.zip googletest-57d6e824b44be45a084fe6baffdfc27b8f8d623f.tar.gz googletest-57d6e824b44be45a084fe6baffdfc27b8f8d623f.tar.bz2 | |
more
Diffstat (limited to 'googletest/include/gtest/gtest.h')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index cbab121..16183e1 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -82,14 +82,15 @@ namespace testing { -// Silence C4100 (unreferenced formal parameter) for MSVC +// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15 #ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable:4100) -# pragma warning(disable:4805) +# if _MSC_VER <= 1900 +# pragma warning(push) +# pragma warning(disable:4100) +# pragma warning(disable:4805) +# endif #endif - // Declares the flags. // This flag temporary enables the disabled tests. @@ -2307,7 +2308,9 @@ bool StaticAssertTypeEq() { GTEST_API_ std::string TempDir(); #ifdef _MSC_VER -# pragma warning(pop) +# if _MSC_VER <= 1900 +# pragma warning(pop) +# endif #endif } // namespace testing |