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

more msvc

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-09 12:03:40 -04:00
parent 431bfdcaf4
commit c4684b49cf
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,16 +37,6 @@
// 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.
@ -55,9 +45,3 @@
#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

15
googlemock/test/gmock_all_test.cc
View File

@ -36,6 +36,15 @@
// includes most such tests, making it easier for these users to maintain // includes most such tests, making it easier for these users to maintain
// their build scripts (they just need to build this file, even though the // their build scripts (they just need to build this file, even though the
// below list of actual *_test.cc files might change). // 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-actions_test.cc"
#include "test/gmock-cardinalities_test.cc" #include "test/gmock-cardinalities_test.cc"
#include "test/gmock-generated-actions_test.cc" #include "test/gmock-generated-actions_test.cc"
@ -49,3 +58,9 @@
#include "test/gmock-port_test.cc" #include "test/gmock-port_test.cc"
#include "test/gmock-spec-builders_test.cc" #include "test/gmock-spec-builders_test.cc"
#include "test/gmock_test.cc" #include "test/gmock_test.cc"
#ifdef _MSC_VER
#if _MSC_VER == 1900
# pragma warning(pop)
#endif
#endif