diff options
author | Gennadiy Civil <misterg@google.com> | 2018-04-10 16:10:34 -0400 |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 16:10:34 -0400 |
commit | 39c58da187c9cd54e54560601be4b7ceef320da4 (patch) | |
tree | f74c36bfff352cf49eb110b3f2f6ff57d18dc37f /googlemock/src/gmock-internal-utils.cc | |
parent | e1071eb9497304a38e69737e90a88b4877b8b736 (diff) | |
parent | 8fbb4194709cc9fd3de3deb2b406461a173bab15 (diff) | |
download | googletest-39c58da187c9cd54e54560601be4b7ceef320da4.tar.gz googletest-39c58da187c9cd54e54560601be4b7ceef320da4.tar.bz2 googletest-39c58da187c9cd54e54560601be4b7ceef320da4.zip |
merge
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 " |