3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2024-12-27 10:11:03 +08:00
Code Issues Projects Releases Wiki Activity

msvc

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-09 13:51:01 -04:00
parent c4684b49cf
commit e93a0ece26
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,13 @@
//
// This file tests the built-in actions.
#ifdef _MSC_VER
#if _MSC_VER <= 1900
# pragma warning(push)
# pragma warning(disable:4800)
#endif
#endif
#include "gmock/gmock-actions.h"
#include <algorithm>
#include <iterator>
@ -1556,3 +1563,9 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) {
#endif // GTEST_LANG_CXX11
} // Unnamed namespace
#ifdef _MSC_VER
#if _MSC_VER == 1900
# pragma warning(pop)
#endif
#endif

12
googlemock/test/gmock_all_test.cc
View File

@ -38,13 +38,6 @@
// below list of actual *_test.cc files might change).
// 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)
# pragma warning(disable:4800)
#endif
#endif
#include "test/gmock-actions_test.cc"
#include "test/gmock-cardinalities_test.cc"
#include "test/gmock-generated-actions_test.cc"
@ -59,8 +52,3 @@
#include "test/gmock-spec-builders_test.cc"
#include "test/gmock_test.cc"
#ifdef _MSC_VER
#if _MSC_VER == 1900
# pragma warning(pop)
#endif
#endif