diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-06-04 18:29:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 18:29:49 +0000 |
| commit | c9573e147e20e941410693c83e42544dc2709444 (patch) | |
| tree | e2bfb7ad9e80f6c17818f91bded03e37a316d54e /libutils/Unicode.cpp | |
| parent | cc29030cc9c58697d1b75c1518274e34f0bb99e5 (diff) | |
| parent | b2a9129e8f0666884dee660515c51d4dd5c17c7a (diff) | |
am b2a9129e: am bf0ed824: am 60ca7a22: Merge "libutils: turn on -Werror"
* commit 'b2a9129e8f0666884dee660515c51d4dd5c17c7a':
libutils: turn on -Werror
Diffstat (limited to 'libutils/Unicode.cpp')
| -rw-r--r-- | libutils/Unicode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp index a66e3bbbb..fe8887d92 100644 --- a/libutils/Unicode.cpp +++ b/libutils/Unicode.cpp @@ -576,7 +576,7 @@ void utf8_to_utf16(const uint8_t* u8str, size_t u8len, char16_t* u16str) { char16_t* utf8_to_utf16_n(const uint8_t* src, size_t srcLen, char16_t* dst, size_t dstLen) { const uint8_t* const u8end = src + srcLen; const uint8_t* u8cur = src; - const uint16_t* const u16end = dst + dstLen; + const char16_t* const u16end = dst + dstLen; char16_t* u16cur = dst; while (u8cur < u8end && u16cur < u16end) { |