summaryrefslogtreecommitdiffstats
path: root/libutils/Unicode.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-30 11:10:46 -0700
committerMark Salyzyn <salyzyn@google.com>2014-06-02 15:57:50 -0700
commit5bed8036644f552210a7cfcbed2d6d20cf2981b0 (patch)
tree37f784e181086e99b17e00d46b6da30529751539 /libutils/Unicode.cpp
parentbf0f25905b12581f05b65b1ebe95211c727ae483 (diff)
downloadsystem_core-5bed8036644f552210a7cfcbed2d6d20cf2981b0.tar.gz
system_core-5bed8036644f552210a7cfcbed2d6d20cf2981b0.tar.bz2
system_core-5bed8036644f552210a7cfcbed2d6d20cf2981b0.zip
libutils: turn on -Werror
- Deal with some -Wunused issues - Override PRI macros (windows) - Revert use of PRI macros on off64_t (linux) - Deal with a gnu++11 complaince issue Change-Id: Ie66751293bd84477a5a6dfd8a57e700a16e36964
Diffstat (limited to 'libutils/Unicode.cpp')
-rw-r--r--libutils/Unicode.cpp2
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) {