diff options
| author | Daniel Krügler <daniel.kruegler@gmail.com> | 2017-08-21 20:14:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-21 20:14:09 +0200 |
| commit | 8304d06199bdfb13bfb7613db9b5231141300e25 (patch) | |
| tree | d83259649959197c332477d1931a282622bfdbf8 /googlemock/src | |
| parent | b11b2e403e9d8307e5dc7b77c1ddd05335b854e3 (diff) | |
| parent | 675686a139a731a2c796633e67e9421792363709 (diff) | |
| download | googletest-8304d06199bdfb13bfb7613db9b5231141300e25.tar.gz googletest-8304d06199bdfb13bfb7613db9b5231141300e25.tar.bz2 googletest-8304d06199bdfb13bfb7613db9b5231141300e25.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-matchers.cc | 2 | ||||
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/src/gmock-matchers.cc b/googlemock/src/gmock-matchers.cc index e0de25cb..6e40e5e8 100644 --- a/googlemock/src/gmock-matchers.cc +++ b/googlemock/src/gmock-matchers.cc @@ -288,7 +288,7 @@ class MaxBipartiteMatchState { // Each element of the left_ vector represents a left hand side node // (i.e. an element) and each element of right_ is a right hand side // node (i.e. a matcher). The values in the left_ vector indicate - // outflow from that node to a node on the the right_ side. The values + // outflow from that node to a node on the right_ side. The values // in the right_ indicate inflow, and specify which left_ node is // feeding that right_ node, if any. For example, left_[3] == 1 means // there's a flow from element #3 to matcher #1. Such a flow would also diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 2fa1ee4b..f761f97e 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -364,7 +364,7 @@ UntypedFunctionMockerBase::UntypedInvokeWith(const void* const untyped_args) if (!need_to_report_uninteresting_call) { // Perform the action without printing the call information. - return this->UntypedPerformDefaultAction(untyped_args, ""); + return this->UntypedPerformDefaultAction(untyped_args, "Function call: " + std::string(Name())); } // Warns about the uninteresting call. |