3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-21 06:59:36 +08:00
Code Issues Projects Releases Wiki Activity

Replaces UniversalPrinter<T>::Print(x, os) with UniversalPrint(x, os) as appropriate (by Zhanyong Wan).

Browse Source
This commit is contained in:
vladlosev 2010-05-13 18:00:59 +00:00
parent 7aec2f36ba
commit 9af267d247
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/gtest/gtest-printers.h
View File

@ -395,10 +395,10 @@ inline void PrintTo(wchar_t* s, ::std::ostream* os) {
// the curly braces. // the curly braces.
template <typename T> template <typename T>
void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) { void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) {
UniversalPrinter<T>::Print(a[0], os); UniversalPrint(a[0], os);
for (size_t i = 1; i != count; i++) { for (size_t i = 1; i != count; i++) {
*os << ", "; *os << ", ";
UniversalPrinter<T>::Print(a[i], os); UniversalPrint(a[i], os);
} }
} }
@ -515,6 +515,8 @@ void PrintTo(
template <typename T1, typename T2> template <typename T1, typename T2>
void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) { void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
*os << '('; *os << '(';
// We cannot use UniversalPrint(value.first, os) here, as T1 may be
// a reference type. The same for printing value.second.
UniversalPrinter<T1>::Print(value.first, os); UniversalPrinter<T1>::Print(value.first, os);
*os << ", "; *os << ", ";
UniversalPrinter<T2>::Print(value.second, os); UniversalPrinter<T2>::Print(value.second, os);
@ -610,7 +612,7 @@ class UniversalPrinter<T&> {
*os << "@" << reinterpret_cast<const void*>(&value) << " "; *os << "@" << reinterpret_cast<const void*>(&value) << " ";
// Then prints the value itself. // Then prints the value itself.
UniversalPrinter<T>::Print(value, os); UniversalPrint(value, os);
} }
#ifdef _MSC_VER #ifdef _MSC_VER
@ -623,13 +625,13 @@ class UniversalPrinter<T&> {
// NUL-terminated string (but not the pointer) is printed. // NUL-terminated string (but not the pointer) is printed.
template <typename T> template <typename T>
void UniversalTersePrint(const T& value, ::std::ostream* os) { void UniversalTersePrint(const T& value, ::std::ostream* os) {
UniversalPrinter<T>::Print(value, os); UniversalPrint(value, os);
} }
inline void UniversalTersePrint(const char* str, ::std::ostream* os) { inline void UniversalTersePrint(const char* str, ::std::ostream* os) {
if (str == NULL) { if (str == NULL) {
*os << "NULL"; *os << "NULL";
} else { } else {
UniversalPrinter<string>::Print(string(str), os); UniversalPrint(string(str), os);
} }
} }
inline void UniversalTersePrint(char* str, ::std::ostream* os) { inline void UniversalTersePrint(char* str, ::std::ostream* os) {