Merge branch 'refs/heads/master' into flag-default

2017-08-28 16:10:12 -04:00
parent a2803bc37d b43bfcf491
commit c00373320d
115 changed files with 2959 additions and 28062 deletions
--- 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.