diff options
| author | drgler <daniel.kruegler@gmail.com> | 2017-08-22 20:19:13 +0200 |
|---|---|---|
| committer | drgler <daniel.kruegler@gmail.com> | 2017-08-22 20:19:13 +0200 |
| commit | fa3bb1a77973ab75bf4af8b4a5333ba715f367a9 (patch) | |
| tree | 89d3539644e712323c5a1841efcab799f4e58f4c /googlemock/src | |
| parent | 6404d45a92528cb0a8f8294d4c0b057c23138de5 (diff) | |
| parent | 8304d06199bdfb13bfb7613db9b5231141300e25 (diff) | |
| download | googletest-fa3bb1a77973ab75bf4af8b4a5333ba715f367a9.tar.gz googletest-fa3bb1a77973ab75bf4af8b4a5333ba715f367a9.tar.bz2 googletest-fa3bb1a77973ab75bf4af8b4a5333ba715f367a9.zip | |
Merge branch 'master' of github.com:Dani-Hub/googletest
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. |