diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-09 22:37:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 22:37:50 -0400 |
| commit | a072611118dfbdb12ca5d536e852029359e07581 (patch) | |
| tree | 5ee7b5cef61b4b0c0c2fb904ea62444ae7d71709 /googlemock/src/gmock-internal-utils.cc | |
| parent | 7f03f7ceae05d4d45fc4b12b81736c55a13d872c (diff) | |
| parent | ca54b673034f6f182ff22ac554efcd1176f5808c (diff) | |
| download | googletest-a072611118dfbdb12ca5d536e852029359e07581.tar.gz googletest-a072611118dfbdb12ca5d536e852029359e07581.tar.bz2 googletest-a072611118dfbdb12ca5d536e852029359e07581.zip | |
Merge pull request #1556 from google/revert-1551-master
Revert "gmock actions 2"
Diffstat (limited to 'googlemock/src/gmock-internal-utils.cc')
| -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 3fca3f26..20c5a8db 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; } -GTEST_API_ void IllegalDoDefault(const char* file, int line) { +void IllegalDoDefault(const char* file, int line) { internal::Assert( false, file, line, "You are using DoDefault() inside a composite action like " |