Commit 373481c5 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

...merging
parent ef17a9f9
...@@ -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