diff options
author | Dan Albert <danalbert@google.com> | 2014-11-20 11:41:21 -0800 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2014-11-20 11:47:40 -0800 |
commit | 6698749dd4d4d6513b26aa9071af290b956b68a7 (patch) | |
tree | 6c0716e521b60ff501f4aa4a3f7aff160578135f /tools/aapt | |
parent | 36c7f4b67326bad547f16aa6e72140bd839ab28d (diff) | |
download | frameworks_base-6698749dd4d4d6513b26aa9071af290b956b68a7.zip frameworks_base-6698749dd4d4d6513b26aa9071af290b956b68a7.tar.gz frameworks_base-6698749dd4d4d6513b26aa9071af290b956b68a7.tar.bz2 |
Add appropriate casts for char16_t.
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.
Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
Diffstat (limited to 'tools/aapt')
-rw-r--r-- | tools/aapt/AaptXml.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/AaptXml.cpp b/tools/aapt/AaptXml.cpp index 708e405..b04a55d 100644 --- a/tools/aapt/AaptXml.cpp +++ b/tools/aapt/AaptXml.cpp @@ -41,7 +41,7 @@ static String8 getStringAttributeAtIndex(const ResXMLTree& tree, ssize_t attrInd } size_t len; - const uint16_t* str = tree.getAttributeStringValue(attrIndex, &len); + const char16_t* str = tree.getAttributeStringValue(attrIndex, &len); return str ? String8(str, len) : String8(); } @@ -103,7 +103,7 @@ String8 getResolvedAttribute(const ResTable& resTable, const ResXMLTree& tree, 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); |