Index: testing/gmock/include/gmock/gmock-spec-builders.h |
diff --git a/testing/gmock/include/gmock/gmock-spec-builders.h b/testing/gmock/include/gmock/gmock-spec-builders.h |
index 74a095da7571c4b9a6a50e48dce971eef38b50f0..7038c2e436ffcba8a3b315424bc24e3d418f5e26 100644 |
--- a/testing/gmock/include/gmock/gmock-spec-builders.h |
+++ b/testing/gmock/include/gmock/gmock-spec-builders.h |
@@ -69,7 +69,6 @@ |
#include <gmock/gmock-actions.h> |
#include <gmock/gmock-cardinalities.h> |
#include <gmock/gmock-matchers.h> |
-#include <gmock/gmock-printers.h> |
#include <gmock/internal/gmock-internal-utils.h> |
#include <gmock/internal/gmock-port.h> |
#include <gtest/gtest.h> |
@@ -1269,6 +1268,7 @@ class ActionResultHolder { |
// Prints the held value as an action's result to os. |
void PrintAsActionResult(::std::ostream* os) const { |
*os << "\n Returns: "; |
+ // T may be a reference type, so we don't use UniversalPrint(). |
UniversalPrinter<T>::Print(value_, os); |
} |
@@ -1540,7 +1540,7 @@ class FunctionMockerBase : public UntypedFunctionMockerBase { |
*os << "Uninteresting mock function call - "; |
DescribeDefaultActionTo(args, os); |
*os << " Function call: " << Name(); |
- UniversalPrinter<ArgumentTuple>::Print(args, os); |
+ UniversalPrint(args, os); |
} |
// Critical section: We must find the matching expectation and the |
@@ -1776,7 +1776,7 @@ typename Function<F>::Result FunctionMockerBase<F>::InvokeWith( |
} |
ss << " Function call: " << Name(); |
- UniversalPrinter<ArgumentTuple>::Print(args, &ss); |
+ UniversalPrint(args, &ss); |
// In case the action deletes a piece of the expectation, we |
// generate the message beforehand. |