| Index: base/stringprintf.h
|
| diff --git a/base/stringprintf.h b/base/stringprintf.h
|
| index 40ad107aead14fd3af62aeafb63f6aae21ac861a..60fbad5c83da684313aad166c7a1233a68770727 100644
|
| --- a/base/stringprintf.h
|
| +++ b/base/stringprintf.h
|
| @@ -17,8 +17,11 @@ namespace base {
|
| // Return a C++ string given printf-like input.
|
| BASE_EXPORT std::string StringPrintf(const char* format, ...)
|
| PRINTF_FORMAT(1, 2);
|
| +// OS_ANDROID's libc does not support wchar_t, so several overloads are omitted.
|
| +#if !defined(OS_ANDROID)
|
| BASE_EXPORT std::wstring StringPrintf(const wchar_t* format, ...)
|
| WPRINTF_FORMAT(1, 2);
|
| +#endif
|
|
|
| // Return a C++ string given vprintf-like input.
|
| BASE_EXPORT std::string StringPrintV(const char* format, va_list ap)
|
| @@ -28,25 +31,31 @@ BASE_EXPORT std::string StringPrintV(const char* format, va_list ap)
|
| BASE_EXPORT const std::string& SStringPrintf(std::string* dst,
|
| const char* format, ...)
|
| PRINTF_FORMAT(2, 3);
|
| +#if !defined(OS_ANDROID)
|
| BASE_EXPORT const std::wstring& SStringPrintf(std::wstring* dst,
|
| const wchar_t* format, ...)
|
| WPRINTF_FORMAT(2, 3);
|
| +#endif
|
|
|
| // Append result to a supplied string.
|
| BASE_EXPORT void StringAppendF(std::string* dst, const char* format, ...)
|
| PRINTF_FORMAT(2, 3);
|
| +#if !defined(OS_ANDROID)
|
| // TODO(evanm): this is only used in a few places in the code;
|
| // replace with string16 version.
|
| BASE_EXPORT void StringAppendF(std::wstring* dst, const wchar_t* format, ...)
|
| WPRINTF_FORMAT(2, 3);
|
| +#endif
|
|
|
| // Lower-level routine that takes a va_list and appends to a specified
|
| // string. All other routines are just convenience wrappers around it.
|
| BASE_EXPORT void StringAppendV(std::string* dst, const char* format, va_list ap)
|
| PRINTF_FORMAT(2, 0);
|
| +#if !defined(OS_ANDROID)
|
| BASE_EXPORT void StringAppendV(std::wstring* dst,
|
| const wchar_t* format, va_list ap)
|
| WPRINTF_FORMAT(2, 0);
|
| +#endif
|
|
|
| } // namespace base
|
|
|
|
|