diff options
| -rw-r--r-- | base/stringprintf.h | 1 | ||||
| -rw-r--r-- | skia/ext/google_logging.cc | 6 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/overrides/google/cacheinvalidation/string_util.h | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/base/stringprintf.h b/base/stringprintf.h index f3ca6e7..9170ddd 100644 --- a/base/stringprintf.h +++ b/base/stringprintf.h @@ -49,6 +49,5 @@ void StringAppendV(std::wstring* dst, const wchar_t* format, va_list ap) // // TODO(brettw) remove these when calling code is converted. using base::StringPrintf; -using base::StringAppendV; #endif // BASE_STRINGPRINTF_H_ diff --git a/skia/ext/google_logging.cc b/skia/ext/google_logging.cc index 72328b8..aec809e 100644 --- a/skia/ext/google_logging.cc +++ b/skia/ext/google_logging.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ // that provides integration with the logging of your choice. #include "base/logging.h" -#include "base/string_util.h" +#include "base/stringprintf.h" void SkDebugf_FileLine(const char* file, int line, bool fatal, const char* format, ...) { @@ -15,7 +15,7 @@ void SkDebugf_FileLine(const char* file, int line, bool fatal, va_start(ap, format); std::string msg; - StringAppendV(&msg, format, ap); + base::StringAppendV(&msg, format, ap); logging::LogMessage(file, line, fatal ? logging::LOG_FATAL : logging::LOG_INFO).stream() diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/string_util.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/string_util.h index 81e9d8b..36d3713 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/string_util.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/string_util.h @@ -5,11 +5,11 @@ #ifndef GOOGLE_CACHEINVALIDATION_STRING_UTIL_H_ #define GOOGLE_CACHEINVALIDATION_STRING_UTIL_H_ -#include "base/string_util.h" +#include "base/stringprintf.h" namespace invalidation { -using ::StringAppendV; +using base::StringAppendV; } // namespace invalidation |