aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/src
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-03-03 12:17:35 -0500
committervslashg <gfalcon@google.com>2020-03-17 17:20:15 -0400
commit0bf8ea3065f791289f383afee43d8464638a5075 (patch)
tree4eaa3f2a1dc51ab896b8d3b9d1751c4af66c2559 /googletest/src
parent3de76551e0f0e65b184f841a76088df86263a068 (diff)
downloadgoogletest-0bf8ea3065f791289f383afee43d8464638a5075.tar.gz
googletest-0bf8ea3065f791289f383afee43d8464638a5075.tar.bz2
googletest-0bf8ea3065f791289f383afee43d8464638a5075.zip
Googletest export
Simplify the fallback printing logic to have a single sequence of trial printers. PiperOrigin-RevId: 298621376
Diffstat (limited to 'googletest/src')
-rw-r--r--googletest/src/gtest-printers.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc
index 3337be31..4e1ccad8 100644
--- a/googletest/src/gtest-printers.cc
+++ b/googletest/src/gtest-printers.cc
@@ -104,7 +104,7 @@ void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count,
} // namespace
-namespace internal2 {
+namespace internal {
// Delegates to PrintBytesInObjectToImpl() to print the bytes in the
// given object. The delegation simplifies the implementation, which
@@ -116,10 +116,6 @@ void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count,
PrintBytesInObjectToImpl(obj_bytes, count, os);
}
-} // namespace internal2
-
-namespace internal {
-
// Depending on the value of a char (or wchar_t), we print it in one
// of three formats:
// - as is if it's a printable ASCII (e.g. 'a', '2', ' '),