diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-10 16:10:34 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 16:10:34 -0400 |
| commit | 39c58da187c9cd54e54560601be4b7ceef320da4 (patch) | |
| tree | f74c36bfff352cf49eb110b3f2f6ff57d18dc37f /googletest/include/gtest/gtest.h | |
| parent | e1071eb9497304a38e69737e90a88b4877b8b736 (diff) | |
| parent | 8fbb4194709cc9fd3de3deb2b406461a173bab15 (diff) | |
| download | googletest-39c58da187c9cd54e54560601be4b7ceef320da4.tar.gz googletest-39c58da187c9cd54e54560601be4b7ceef320da4.zip | |
merge
Diffstat (limited to 'googletest/include/gtest/gtest.h')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 1c39310b..cbab121a 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -82,12 +82,11 @@ namespace testing { -// Silence C4100 (unreferenced formal parameter) and 4805 -// unsafe mix of type 'const int' and type 'const bool' +// Silence C4100 (unreferenced formal parameter) for MSVC #ifdef _MSC_VER # pragma warning(push) +# pragma warning(disable:4100) # pragma warning(disable:4805) -# pragma warning(disable:4100) #endif @@ -2308,7 +2307,7 @@ bool StaticAssertTypeEq() { GTEST_API_ std::string TempDir(); #ifdef _MSC_VER -# pragma warning(pop) +# pragma warning(pop) #endif } // namespace testing |
