gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msvc 14

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

16
googlemock/src/gmock-all.cc
View File

@@ -37,6 +37,16 @@
// This line ensures that gmock.h can be compiled on its own, even // This line ensures that gmock.h can be compiled on its own, even
// when it's fused. // when it's fused.
// 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 "gmock/gmock.h" #include "gmock/gmock.h"
// The following lines pull in the real gmock *.cc files. // The following lines pull in the real gmock *.cc files.
@@ -45,3 +55,9 @@
#include "src/gmock-matchers.cc" #include "src/gmock-matchers.cc"
#include "src/gmock-spec-builders.cc" #include "src/gmock-spec-builders.cc"
#include "src/gmock.cc" #include "src/gmock.cc"
#ifdef _MSC_VER
#if _MSC_VER == 1900
# pragma warning(pop)
#endif
#endif

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

@@ -42,15 +42,6 @@
#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 {
@@ -718,8 +709,3 @@ 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