diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 04:45:27 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 04:45:27 +0000 |
| commit | e25bb45d3b7f18173cf40254afa202a6c03af291 (patch) | |
| tree | 714b3059d0779278c8c2bd760290449b12cfd3e1 /base/third_party | |
| parent | f63c2eb74e98a0c0c8384ca885e30dc7cff70c50 (diff) | |
| download | chromium_src-e25bb45d3b7f18173cf40254afa202a6c03af291.zip chromium_src-e25bb45d3b7f18173cf40254afa202a6c03af291.tar.gz chromium_src-e25bb45d3b7f18173cf40254afa202a6c03af291.tar.bz2 | |
Fix compiler errors when using CBU16_{LEAD,TRAIL} from base/third_party/icu/icu_utf.h.
These macros referenced type UChar which is not defined in base_icu. Define a
type for it in the base_icu:: namespace.
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/93973007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239652 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/third_party')
| -rw-r--r-- | base/third_party/icu/icu_utf.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/base/third_party/icu/icu_utf.h b/base/third_party/icu/icu_utf.h index 9cb1247..a604e5f 100644 --- a/base/third_party/icu/icu_utf.h +++ b/base/third_party/icu/icu_utf.h @@ -22,6 +22,7 @@ namespace base_icu { typedef uint32 UChar32; +typedef uint16 UChar; typedef int8 UBool; // General --------------------------------------------------------------------- @@ -304,7 +305,8 @@ UChar32 utf8_nextCharSafeBody(const uint8 *s, int32 *pi, int32 length, UChar32 c * @return lead surrogate (U+d800..U+dbff) for supplementary * @stable ICU 2.4 */ -#define CBU16_LEAD(supplementary) (UChar)(((supplementary)>>10)+0xd7c0) +#define CBU16_LEAD(supplementary) \ + (base_icu::UChar)(((supplementary)>>10)+0xd7c0) /** * Get the trail surrogate (0xdc00..0xdfff) for a @@ -313,7 +315,8 @@ UChar32 utf8_nextCharSafeBody(const uint8 *s, int32 *pi, int32 length, UChar32 c * @return trail surrogate (U+dc00..U+dfff) for supplementary * @stable ICU 2.4 */ -#define CBU16_TRAIL(supplementary) (UChar)(((supplementary)&0x3ff)|0xdc00) +#define CBU16_TRAIL(supplementary) \ + (base_icu::UChar)(((supplementary)&0x3ff)|0xdc00) /** * How many 16-bit code units are used to encode this Unicode code point? (1 or 2) |