diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-11 16:06:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-11 16:06:23 -0400 |
| commit | fdb57f85710ccb17076acb1870a881964f5e04af (patch) | |
| tree | 7dbb71fceeb5c516e0e0424085980830875928c1 /googlemock/src | |
| parent | 6273647250410f2df9f78d57d2bfccad02b0d419 (diff) | |
| parent | 373481c5a9b9bf08c158703d6dc5ab58d4dee0cc (diff) | |
| download | googletest-fdb57f85710ccb17076acb1870a881964f5e04af.tar.gz googletest-fdb57f85710ccb17076acb1870a881964f5e04af.tar.bz2 googletest-fdb57f85710ccb17076acb1870a881964f5e04af.zip | |
Merge pull request #1561 from gennadiycivil/master
Merging gmock-actions
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-internal-utils.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc index 20c5a8db..3fca3f26 100644 --- a/googlemock/src/gmock-internal-utils.cc +++ b/googlemock/src/gmock-internal-utils.cc @@ -188,7 +188,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message, std::cout << ::std::flush; } -void IllegalDoDefault(const char* file, int line) { +GTEST_API_ void IllegalDoDefault(const char* file, int line) { internal::Assert( false, file, line, "You are using DoDefault() inside a composite action like " |