diff options
| author | Mark Jan van Kampen <mjvk@allseas.com> | 2020-04-16 12:26:44 (GMT) |
|---|---|---|
| committer | Mark Jan van Kampen <mjvk@allseas.com> | 2020-04-16 12:26:44 (GMT) |
| commit | ee01491229cb1394a51504b8fd3de53e2c3d75d9 (patch) | |
| tree | 947876a9003fcf0a3300340bede8f968a030f928 /googletest/src/gtest-printers.cc | |
| parent | 937b3ce9f7afa1b1ab6fde5c09e460ef40813a9f (diff) | |
| parent | e3f0319d89f4cbf32993de595d984183b1a9fc57 (diff) | |
| download | googletest-ee01491229cb1394a51504b8fd3de53e2c3d75d9.zip googletest-ee01491229cb1394a51504b8fd3de53e2c3d75d9.tar.gz googletest-ee01491229cb1394a51504b8fd3de53e2c3d75d9.tar.bz2 | |
Merge branch 'master' of https://github.com/google/googletest into cmake-QNX-fixrefs/pull/2682/head
# Conflicts:
# CMakeLists.txt
Diffstat (limited to 'googletest/src/gtest-printers.cc')
| -rw-r--r-- | googletest/src/gtest-printers.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc index 3337be3..4e1ccad 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', ' '), |