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

RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR

Browse Source
This commit is contained in:
Gennadiy Civil
2018-04-10 15:57:16 -04:00
parent d0de1180e4
commit e1071eb949
10 changed files with 346 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,12 +50,13 @@
#endif
// Silence C4800 (C4800: 'int *const ': forcing value
// to bool 'true' or 'false') for MSVC 14
#ifdef _MSC_VER && _MSC_VER == 1900
# pragma warning(push)
# pragma warning(disable:4800)
// 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 internal {
@@ -875,6 +876,8 @@ InSequence::~InSequence() {
} // namespace testing
#ifdef _MSC_VER && _MSC_VER == 1900
# pragma warning(pop)
#ifdef _MSC_VER
#if _MSC_VER <= 1900
# pragma warning(pop)
#endif
#endif