generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

testing msvc again

Browse Source
This commit is contained in:
Gennadiy Civil
2018-04-09 11:35:01 -04:00
parent c4e3d77ddc
commit 8bc7c631e8
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,16 +43,6 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "gtest/gtest-spi.h" #include "gtest/gtest-spi.h"
// 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
namespace { namespace {
// This list should be kept sorted. // This list should be kept sorted.
@@ -1566,9 +1556,3 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) {
#endif // GTEST_LANG_CXX11 #endif // GTEST_LANG_CXX11
} // Unnamed namespace } // Unnamed namespace
#ifdef _MSC_VER
#if _MSC_VER == 1900
# pragma warning(pop)
#endif
#endif

14
googlemock/test/gmock-more-actions_test.cc
View File

@@ -42,6 +42,15 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "gtest/internal/gtest-linked_ptr.h" #include "gtest/internal/gtest-linked_ptr.h"
// 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
namespace testing { namespace testing {
namespace gmock_more_actions_test { namespace gmock_more_actions_test {
@@ -709,3 +718,8 @@ TEST(ReturnPointeeTest, Works) {
} // namespace gmock_generated_actions_test } // namespace gmock_generated_actions_test
} // namespace testing } // namespace testing
#ifdef _MSC_VER
#if _MSC_VER == 1900
# pragma warning(pop)
#endif
#endif