diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 15:50:19 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 15:50:19 -0400 |
| commit | 05b5a53898c2466e49f37e84324644949d279b34 (patch) | |
| tree | c16ffae0ea09c666885b228c2cc45acb5ecab1cb | |
| parent | 2de24fbf7a26e679e8dc7d185addd3dc820f347c (diff) | |
| download | googletest-05b5a53898c2466e49f37e84324644949d279b34.tar.gz googletest-05b5a53898c2466e49f37e84324644949d279b34.tar.bz2 googletest-05b5a53898c2466e49f37e84324644949d279b34.zip | |
formatting
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 2 | ||||
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 3 | ||||
| -rw-r--r-- | googlemock/test/gmock_output_test_.cc | 2 | ||||
| -rw-r--r-- | googletest/include/gtest/gtest.h | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 619c0c5b..22d002fe 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -877,7 +877,7 @@ InSequence::~InSequence() { } // namespace testing #ifdef _MSC_VER -#if _MSC_VER == 1900 +#if _MSC_VER <= 1900 # pragma warning(pop) #endif #endif diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index cd517a7d..5dd48460 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -33,6 +33,8 @@ // // This file tests the built-in actions. +// Silence C4800 (C4800: 'int *const ': forcing value +// to bool 'true' or 'false') for MSVC 14,15 #ifdef _MSC_VER #if _MSC_VER <= 1900 # pragma warning(push) @@ -1569,3 +1571,4 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) { # pragma warning(pop) #endif #endif + diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc index 56a00b21..a01b95e5 100644 --- a/googlemock/test/gmock_output_test_.cc +++ b/googlemock/test/gmock_output_test_.cc @@ -39,7 +39,6 @@ #include "gtest/gtest.h" - // Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15 #ifdef _MSC_VER # if _MSC_VER <= 1900 @@ -48,7 +47,6 @@ # endif #endif - using testing::_; using testing::AnyNumber; using testing::Ge; diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 16183e11..c5d1b7c8 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -82,7 +82,8 @@ namespace testing { -// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15 +// Silence C4100 (unreferenced formal parameter) and 4805 +// unsafe mix of bool and type int for MSVC 14 and 15 #ifdef _MSC_VER # if _MSC_VER <= 1900 # pragma warning(push) @@ -91,6 +92,7 @@ namespace testing { # endif #endif + // Declares the flags. // This flag temporary enables the disabled tests. |