diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-01-29 16:15:40 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-01-29 16:15:40 +0000 |
| commit | a198966dd349f446f0ab065e5576db7ac1e48e63 (patch) | |
| tree | 99f9c54d9f958c874a64dcb13f3994ac399e44c1 /src | |
| parent | 48b1315108cdba8f37394aedb8098102ca00e8b9 (diff) | |
| download | googletest-a198966dd349f446f0ab065e5576db7ac1e48e63.tar.gz googletest-a198966dd349f446f0ab065e5576db7ac1e48e63.tar.bz2 googletest-a198966dd349f446f0ab065e5576db7ac1e48e63.zip | |
Renames some internal functions to avoid name clashes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest-printers.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtest-printers.cc b/src/gtest-printers.cc index c85d5822..bfbca9c8 100644 --- a/src/gtest-printers.cc +++ b/src/gtest-printers.cc @@ -308,7 +308,7 @@ void PrintTo(const char* s, ostream* os) { if (s == NULL) { *os << "NULL"; } else { - *os << implicit_cast<const void*>(s) << " pointing to "; + *os << ImplicitCast_<const void*>(s) << " pointing to "; PrintCharsAsStringTo(s, strlen(s), os); } } @@ -325,7 +325,7 @@ void PrintTo(const wchar_t* s, ostream* os) { if (s == NULL) { *os << "NULL"; } else { - *os << implicit_cast<const void*>(s) << " pointing to "; + *os << ImplicitCast_<const void*>(s) << " pointing to "; PrintWideCharsAsStringTo(s, wcslen(s), os); } } |