| Index: base/stringprintf.h
|
| ===================================================================
|
| --- base/stringprintf.h (revision 95578)
|
| +++ base/stringprintf.h (working copy)
|
| @@ -9,42 +9,43 @@
|
|
|
| #include <string>
|
|
|
| -#include "base/base_api.h"
|
| +#include "base/base_export.h"
|
| #include "base/compiler_specific.h"
|
|
|
| namespace base {
|
|
|
| // Return a C++ string given printf-like input.
|
| -BASE_API std::string StringPrintf(const char* format, ...) PRINTF_FORMAT(1, 2);
|
| -BASE_API std::wstring StringPrintf(const wchar_t* format, ...)
|
| +BASE_EXPORT std::string StringPrintf(const char* format, ...)
|
| + PRINTF_FORMAT(1, 2);
|
| +BASE_EXPORT std::wstring StringPrintf(const wchar_t* format, ...)
|
| WPRINTF_FORMAT(1, 2);
|
|
|
| // Return a C++ string given vprintf-like input.
|
| -BASE_API std::string StringPrintV(const char* format, va_list ap)
|
| +BASE_EXPORT std::string StringPrintV(const char* format, va_list ap)
|
| PRINTF_FORMAT(1, 0);
|
|
|
| // Store result into a supplied string and return it.
|
| -BASE_API const std::string& SStringPrintf(std::string* dst,
|
| - const char* format, ...)
|
| +BASE_EXPORT const std::string& SStringPrintf(std::string* dst,
|
| + const char* format, ...)
|
| PRINTF_FORMAT(2, 3);
|
| -BASE_API const std::wstring& SStringPrintf(std::wstring* dst,
|
| - const wchar_t* format, ...)
|
| +BASE_EXPORT const std::wstring& SStringPrintf(std::wstring* dst,
|
| + const wchar_t* format, ...)
|
| WPRINTF_FORMAT(2, 3);
|
|
|
| // Append result to a supplied string.
|
| -BASE_API void StringAppendF(std::string* dst, const char* format, ...)
|
| +BASE_EXPORT void StringAppendF(std::string* dst, const char* format, ...)
|
| PRINTF_FORMAT(2, 3);
|
| // TODO(evanm): this is only used in a few places in the code;
|
| // replace with string16 version.
|
| -BASE_API void StringAppendF(std::wstring* dst, const wchar_t* format, ...)
|
| +BASE_EXPORT void StringAppendF(std::wstring* dst, const wchar_t* format, ...)
|
| WPRINTF_FORMAT(2, 3);
|
|
|
| // Lower-level routine that takes a va_list and appends to a specified
|
| // string. All other routines are just convenience wrappers around it.
|
| -BASE_API void StringAppendV(std::string* dst, const char* format, va_list ap)
|
| +BASE_EXPORT void StringAppendV(std::string* dst, const char* format, va_list ap)
|
| PRINTF_FORMAT(2, 0);
|
| -BASE_API void StringAppendV(std::wstring* dst,
|
| - const wchar_t* format, va_list ap)
|
| +BASE_EXPORT void StringAppendV(std::wstring* dst,
|
| + const wchar_t* format, va_list ap)
|
| WPRINTF_FORMAT(2, 0);
|
|
|
| } // namespace base
|
|
|