Skip to content

GitLab

Commit 2d4d4ef7 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

fixing MSVC

parent 5fe8de5d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
googlemock/include/gmock/gmock-more-matchers.h
View file @ 2d4d4ef7
...@@ -49,6 +49,8 @@ namespace testing { ...@@ -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
......
googlemock/src/gmock-internal-utils.cc
View file @ 2d4d4ef7
...@@ -188,7 +188,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message, ...@@ -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 "
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment