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

fixing MSVC

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-06 16:31:11 -04:00
parent 5fe8de5ded
commit 2d4d4ef739
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/include/gmock/gmock-more-matchers.h
View File

@ -49,6 +49,8 @@ namespace testing {
# pragma warning(push) # pragma warning(push)
# pragma warning(disable:4100) # pragma warning(disable:4100)
#if (_MSC_VER == 1900) #if (_MSC_VER == 1900)
// and silence C4800 (C4800: 'int *const ': forcing value
// to bool 'true' or 'false') for MSVC 14
# pragma warning(disable:4800) # pragma warning(disable:4800)
#endif #endif
#endif #endif

2
googlemock/src/gmock-internal-utils.cc
View File

@ -188,7 +188,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message,
std::cout << ::std::flush; std::cout << ::std::flush;
} }
void IllegalDoDefault(const char* file, int line) { GTEST_API_ void IllegalDoDefault(const char* file, int line) {
internal::Assert( internal::Assert(
false, file, line, false, file, line,
"You are using DoDefault() inside a composite action like " "You are using DoDefault() inside a composite action like "