From f348c15ecf78e9d58b8238ffcf1d78a279e3a862 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 8 Sep 2014 18:28:00 -0700 Subject: Use char16_t for char things. When compiling in C++ mode, the compiler will complain about conversions from uint16_t to char16_t. Be consistent in using char16_t for strings. Change-Id: I052b6176ced635162920b31560052d9a64f92764 --- tools/aapt/Command.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/aapt/Command.cpp') diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index f7de5581527b..4dc9bfc31c8f 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -253,7 +253,7 @@ String8 getAttribute(const ResXMLTree& tree, const char* ns, } } size_t len; - const uint16_t* str = tree.getAttributeStringValue(idx, &len); + const char16_t* str = tree.getAttributeStringValue(idx, &len); return str ? String8(str, len) : String8(); } @@ -271,7 +271,7 @@ static String8 getAttribute(const ResXMLTree& tree, uint32_t attrRes, String8* o } } size_t len; - const uint16_t* str = tree.getAttributeStringValue(idx, &len); + const char16_t* str = tree.getAttributeStringValue(idx, &len); return str ? String8(str, len) : String8(); } @@ -325,7 +325,7 @@ static String8 getResolvedAttribute(const ResTable* resTable, const ResXMLTree& if (tree.getAttributeValue(idx, &value) != NO_ERROR) { if (value.dataType == Res_value::TYPE_STRING) { size_t len; - const uint16_t* str = tree.getAttributeStringValue(idx, &len); + const char16_t* str = tree.getAttributeStringValue(idx, &len); return str ? String8(str, len) : String8(); } resTable->resolveReference(&value, 0); -- cgit v1.2.3-59-g8ed1b