summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authormmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-12 15:06:52 +0000
committermmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-12 15:06:52 +0000
commit169da8f5bba74250fe73f708a1a3b666b4fb2431 (patch)
treef694c89ce7e71369012d4aa6faad7be2632f204d /base
parent82f954e39c77f4dc20d39c88ca49982a9e48cf94 (diff)
downloadchromium_src-169da8f5bba74250fe73f708a1a3b666b4fb2431.zip
chromium_src-169da8f5bba74250fe73f708a1a3b666b4fb2431.tar.gz
chromium_src-169da8f5bba74250fe73f708a1a3b666b4fb2431.tar.bz2
Fix ToUnsigned for 4-byte wchar_t platforms.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/string_util.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/base/string_util.cc b/base/string_util.cc
index 5498652..31f97131b 100644
--- a/base/string_util.cc
+++ b/base/string_util.cc
@@ -70,7 +70,11 @@ struct ToUnsigned<signed char> {
};
template<>
struct ToUnsigned<wchar_t> {
+#if defined(WCHAR_T_IS_UTF16)
typedef unsigned short Unsigned;
+#elif defined(WCHAR_T_IS_UTF32)
+ typedef uint32 Unsigned;
+#endif
};
template<>
struct ToUnsigned<short> {