summaryrefslogtreecommitdiffstats
path: root/base/string_util.h
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 18:39:53 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 18:39:53 +0000
commit46ce5b568acd801330e52a4e04534d9689990835 (patch)
tree86944486c8faf85322981d343013f2de8ecfbb91 /base/string_util.h
parentac201f961a6c0151dc596829584339c199527ba5 (diff)
downloadchromium_src-46ce5b568acd801330e52a4e04534d9689990835.zip
chromium_src-46ce5b568acd801330e52a4e04534d9689990835.tar.gz
chromium_src-46ce5b568acd801330e52a4e04534d9689990835.tar.bz2
Revert 49982 - patch
TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/2825006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/string_util.h')
-rw-r--r--base/string_util.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/base/string_util.h b/base/string_util.h
index 87865b6..11a9fd2 100644
--- a/base/string_util.h
+++ b/base/string_util.h
@@ -54,10 +54,6 @@ int vswprintf(wchar_t* buffer, size_t size,
// Some of these implementations need to be inlined.
-// CLANG NOTE
-// Qualified calls with base:: is to work around
-// http://llvm.org/bugs/show_bug.cgi?id=6762
-
// We separate the declaration from the implementation of this inline
// function just so the PRINTF_FORMAT works.
inline int snprintf(char* buffer, size_t size, const char* format, ...)
@@ -65,7 +61,7 @@ inline int snprintf(char* buffer, size_t size, const char* format, ...)
inline int snprintf(char* buffer, size_t size, const char* format, ...) {
va_list arguments;
va_start(arguments, format);
- int result = base::vsnprintf(buffer, size, format, arguments);
+ int result = vsnprintf(buffer, size, format, arguments);
va_end(arguments);
return result;
}
@@ -77,7 +73,7 @@ inline int swprintf(wchar_t* buffer, size_t size, const wchar_t* format, ...)
inline int swprintf(wchar_t* buffer, size_t size, const wchar_t* format, ...) {
va_list arguments;
va_start(arguments, format);
- int result = base::vswprintf(buffer, size, format, arguments);
+ int result = vswprintf(buffer, size, format, arguments);
va_end(arguments);
return result;
}