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

merging

Browse Source
This commit is contained in:
Gennadiy Civil
2018-04-10 16:18:23 -04:00
parent 39c58da187
commit 25d8176e4f
1 changed files with 10 additions and 7 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 #endif
// Silence C4800 (C4800: 'int *const ': forcing value // Silence C4800 (C4800: 'int *const ': forcing value
// to bool 'true' or 'false') for MSVC 14 // to bool 'true' or 'false') for MSVC 14,15
#ifdef _MSC_VER && _MSC_VER == 1900 #ifdef _MSC_VER
# pragma warning(push) #if _MSC_VER <= 1900
# pragma warning(disable:4800) # pragma warning(push)
# pragma warning(disable:4800)
#endif
#endif #endif
namespace testing { namespace testing {
namespace internal { namespace internal {
@@ -875,6 +876,8 @@ InSequence::~InSequence() {
} // namespace testing } // namespace testing
#ifdef _MSC_VER && _MSC_VER == 1900 #ifdef _MSC_VER
# pragma warning(pop) #if _MSC_VER <= 1900
# pragma warning(pop)
#endif
#endif #endif