Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1530)

Unified Diff: base/strings/stringprintf.cc

Issue 822713002: Update from https://crrev.com/309415 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/strings/stringprintf.cc
diff --git a/base/strings/stringprintf.cc b/base/strings/stringprintf.cc
index f3a57b33e2721e8fea9080dc3bdd9f253a783af1..537873d71c844435a71999c00d3cd5f7d6700565 100644
--- a/base/strings/stringprintf.cc
+++ b/base/strings/stringprintf.cc
@@ -6,6 +6,8 @@
#include <errno.h>
+#include <vector>
+
#include "base/scoped_clear_errno.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -27,7 +29,7 @@ inline int vsnprintfT(char* buffer,
return base::vsnprintf(buffer, buf_size, format, argptr);
}
-#if !defined(OS_ANDROID)
+#if defined(OS_WIN)
inline int vsnprintfT(wchar_t* buffer,
size_t buf_size,
const wchar_t* format,
@@ -117,7 +119,7 @@ std::string StringPrintf(const char* format, ...) {
return result;
}
-#if !defined(OS_ANDROID)
+#if defined(OS_WIN)
std::wstring StringPrintf(const wchar_t* format, ...) {
va_list ap;
va_start(ap, format);
@@ -143,7 +145,7 @@ const std::string& SStringPrintf(std::string* dst, const char* format, ...) {
return *dst;
}
-#if !defined(OS_ANDROID)
+#if defined(OS_WIN)
const std::wstring& SStringPrintf(std::wstring* dst,
const wchar_t* format, ...) {
va_list ap;
@@ -162,7 +164,7 @@ void StringAppendF(std::string* dst, const char* format, ...) {
va_end(ap);
}
-#if !defined(OS_ANDROID)
+#if defined(OS_WIN)
void StringAppendF(std::wstring* dst, const wchar_t* format, ...) {
va_list ap;
va_start(ap, format);
@@ -175,7 +177,7 @@ void StringAppendV(std::string* dst, const char* format, va_list ap) {
StringAppendVT(dst, format, ap);
}
-#if !defined(OS_ANDROID)
+#if defined(OS_WIN)
void StringAppendV(std::wstring* dst, const wchar_t* format, va_list ap) {
StringAppendVT(dst, format, ap);
}

Powered by Google App Engine
This is Rietveld 408576698