...merging
This commit is contained in:
parent
ef17a9f98a
commit
373481c5a9
@ -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 "
|
||||||
|
Loading…
Reference in New Issue
Block a user