diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/i18n/number_formatting.cc | 1 | ||||
| -rw-r--r-- | base/json/json_reader.cc | 5 | ||||
| -rw-r--r-- | base/json/json_writer.cc | 4 | ||||
| -rw-r--r-- | base/json/string_escape.cc | 3 | ||||
| -rw-r--r-- | base/process_util_linux.cc | 3 |
5 files changed, 10 insertions, 6 deletions
diff --git a/base/i18n/number_formatting.cc b/base/i18n/number_formatting.cc index 6b28de5..a529a84 100644 --- a/base/i18n/number_formatting.cc +++ b/base/i18n/number_formatting.cc @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" +#include "base/stringprintf.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "unicode/numfmt.h" diff --git a/base/json/json_reader.cc b/base/json/json_reader.cc index 82bc7d4..b286995 100644 --- a/base/json/json_reader.cc +++ b/base/json/json_reader.cc @@ -7,6 +7,7 @@ #include "base/float_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -189,8 +190,8 @@ Value* JSONReader::JsonToValue(const std::string& json, bool check_root, std::string JSONReader::FormatErrorMessage(int line, int column, const std::string& description) { if (line || column) { - return StringPrintf("Line: %i, column: %i, %s", - line, column, description.c_str()); + return base::StringPrintf( + "Line: %i, column: %i, %s", line, column, description.c_str()); } return description; } diff --git a/base/json/json_writer.cc b/base/json/json_writer.cc index fa8f239..6531772 100644 --- a/base/json/json_writer.cc +++ b/base/json/json_writer.cc @@ -6,7 +6,7 @@ #include "base/json/string_escape.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/values.h" #include "base/utf_string_conversions.h" @@ -71,7 +71,7 @@ void JSONWriter::BuildJSONString(const Value* const node, int value; bool result = node->GetAsInteger(&value); DCHECK(result); - StringAppendF(json_string_, "%d", value); + base::StringAppendF(json_string_, "%d", value); break; } diff --git a/base/json/string_escape.cc b/base/json/string_escape.cc index 0b12439..b4415b8 100644 --- a/base/json/string_escape.cc +++ b/base/json/string_escape.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/stringprintf.h" #include "base/string_util.h" namespace base { @@ -63,7 +64,7 @@ void JsonDoubleQuoteT(const STR& str, // 2. Technically, we could also pass through c > 126 as UTF8, but this // is also optional. It would also be a pain to implement here. unsigned int as_uint = static_cast<unsigned int>(c); - StringAppendF(dst, "\\u%04X", as_uint); + base::StringAppendF(dst, "\\u%04X", as_uint); } else { unsigned char ascii = static_cast<unsigned char>(*it); dst->push_back(ascii); diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index 4cd27f6..fea4347 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -17,6 +17,7 @@ #include "base/file_util.h" #include "base/logging.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_tokenizer.h" @@ -75,7 +76,7 @@ int GetProcessCPU(pid_t pid) { base::ThreadRestrictions::ScopedAllowIO allow_io; // Use /proc/<pid>/task to find all threads and parse their /stat file. - FilePath path = FilePath(StringPrintf("/proc/%d/task/", pid)); + FilePath path = FilePath(base::StringPrintf("/proc/%d/task/", pid)); DIR* dir = opendir(path.value().c_str()); if (!dir) { |