eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-09 15:50:19 -04:00
parent 9d1fb0287a
commit d1a6cb501e
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/src/gmock-spec-builders.cc
View File

@ -877,7 +877,7 @@ InSequence::~InSequence() {
} // namespace testing } // namespace testing
#ifdef _MSC_VER #ifdef _MSC_VER
#if _MSC_VER == 1900 #if _MSC_VER <= 1900
# pragma warning(pop) # pragma warning(pop)
#endif #endif
#endif #endif

3
googlemock/test/gmock-actions_test.cc
View File

@ -33,6 +33,8 @@
// //
// This file tests the built-in actions. // 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 #ifdef _MSC_VER
#if _MSC_VER <= 1900 #if _MSC_VER <= 1900
# pragma warning(push) # pragma warning(push)
@ -1569,3 +1571,4 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) {
# pragma warning(pop) # pragma warning(pop)
#endif #endif
#endif #endif

2
googlemock/test/gmock_output_test_.cc
View File

@ -39,7 +39,6 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15 // Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15
#ifdef _MSC_VER #ifdef _MSC_VER
# if _MSC_VER <= 1900 # if _MSC_VER <= 1900
@ -48,7 +47,6 @@
# endif # endif
#endif #endif
using testing::_; using testing::_;
using testing::AnyNumber; using testing::AnyNumber;
using testing::Ge; using testing::Ge;

4
googletest/include/gtest/gtest.h
View File

@ -82,7 +82,8 @@
namespace testing { 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 #ifdef _MSC_VER
# if _MSC_VER <= 1900 # if _MSC_VER <= 1900
# pragma warning(push) # pragma warning(push)
@ -91,6 +92,7 @@ namespace testing {
# endif # endif
#endif #endif
// Declares the flags. // Declares the flags.
// This flag temporary enables the disabled tests. // This flag temporary enables the disabled tests.