Skip to content

GitLab

Commit 9bc82ce7 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

merging
parent 25d8176e
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
googlemock/test/gmock_output_test_.cc
View file @ 9bc82ce7
...@@ -39,14 +39,12 @@ ...@@ -39,14 +39,12 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
// Silence C4100 (unreferenced formal parameter)
// Silence C4100 (unreferenced formal parameter) for MSVC
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push) # pragma warning(push)
# pragma warning(disable:4100) # pragma warning(disable:4100)
#endif #endif
using testing::_; using testing::_;
using testing::AnyNumber; using testing::AnyNumber;
using testing::Ge; using testing::Ge;
...@@ -306,3 +304,7 @@ int main(int argc, char **argv) { ...@@ -306,3 +304,7 @@ int main(int argc, char **argv) {
TestCatchesLeakedMocksInAdHocTests(); TestCatchesLeakedMocksInAdHocTests();
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }
#ifdef _MSC_VER
# pragma warning(pop)
#endif
googletest/include/gtest/gtest.h
View file @ 9bc82ce7
...@@ -82,11 +82,12 @@ ...@@ -82,11 +82,12 @@
namespace testing { 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 #ifdef _MSC_VER
# pragma warning(push) # pragma warning(push)
# pragma warning(disable:4100)
# pragma warning(disable:4805) # pragma warning(disable:4805)
# pragma warning(disable:4100)
#endif #endif
...@@ -2307,7 +2308,7 @@ bool StaticAssertTypeEq() { ...@@ -2307,7 +2308,7 @@ bool StaticAssertTypeEq() {
GTEST_API_ std::string TempDir(); GTEST_API_ std::string TempDir();
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(pop) # pragma warning(pop)
#endif #endif
} // namespace testing } // namespace testing
......
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