diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-10 20:22:50 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 20:22:50 (GMT) |
| commit | 9bc82ce7251b01ac3abfb28efc9793b56fa835d6 (patch) | |
| tree | d98e7086c5178f838d473f7fe5028ad4911f5f87 | |
| parent | 25d8176e4fc8988367fbe3ce1a8ca0b92b79bbfa (diff) | |
| download | googletest-9bc82ce7251b01ac3abfb28efc9793b56fa835d6.zip googletest-9bc82ce7251b01ac3abfb28efc9793b56fa835d6.tar.gz googletest-9bc82ce7251b01ac3abfb28efc9793b56fa835d6.tar.bz2 | |
merging
| -rw-r--r-- | googlemock/test/gmock_output_test_.cc | 8 | ||||
| -rw-r--r-- | googletest/include/gtest/gtest.h | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc index 59ea51b..1b59eb3 100644 --- a/googlemock/test/gmock_output_test_.cc +++ b/googlemock/test/gmock_output_test_.cc @@ -39,14 +39,12 @@ #include "gtest/gtest.h" - -// Silence C4100 (unreferenced formal parameter) for MSVC +// Silence C4100 (unreferenced formal parameter) #ifdef _MSC_VER # pragma warning(push) # pragma warning(disable:4100) #endif - using testing::_; using testing::AnyNumber; using testing::Ge; @@ -306,3 +304,7 @@ int main(int argc, char **argv) { TestCatchesLeakedMocksInAdHocTests(); return RUN_ALL_TESTS(); } + +#ifdef _MSC_VER +# pragma warning(pop) +#endif diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index cbab121..a0592a8 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -82,11 +82,12 @@ namespace testing { -// Silence C4100 (unreferenced formal parameter) for MSVC +// Silence C4100 (unreferenced formal parameter) and 4805 +// unsafe mix of type 'const int' and type 'const bool' #ifdef _MSC_VER # pragma warning(push) -# pragma warning(disable:4100) # pragma warning(disable:4805) +# pragma warning(disable:4100) #endif @@ -2307,7 +2308,7 @@ bool StaticAssertTypeEq() { GTEST_API_ std::string TempDir(); #ifdef _MSC_VER -# pragma warning(pop) +# pragma warning(pop) #endif } // namespace testing |