diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-09 04:30:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-09 04:30:35 +0000 |
| commit | 2ffa4aabd76353a907ee89a3e0c6f1961237f257 (patch) | |
| tree | 155ccc475b02ef260666cc118fcfd8fc3a2474f7 /tools/aapt/StringPool.cpp | |
| parent | 5a6934c07946743e622df52ba1155d97129b37f0 (diff) | |
| parent | f348c15ecf78e9d58b8238ffcf1d78a279e3a862 (diff) | |
| download | frameworks_base-2ffa4aabd76353a907ee89a3e0c6f1961237f257.zip frameworks_base-2ffa4aabd76353a907ee89a3e0c6f1961237f257.tar.gz frameworks_base-2ffa4aabd76353a907ee89a3e0c6f1961237f257.tar.bz2 | |
Merge "Use char16_t for char things."
Diffstat (limited to 'tools/aapt/StringPool.cpp')
| -rw-r--r-- | tools/aapt/StringPool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index 158b391..c7fd040 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -21,7 +21,7 @@ #define NOISY(x) //x -void strcpy16_htod(uint16_t* dst, const uint16_t* src) +void strcpy16_htod(char16_t* dst, const char16_t* src) { while (*src) { char16_t s = htods(*src); @@ -447,9 +447,9 @@ status_t StringPool::writeStringBlock(const sp<AaptFile>& pool) strncpy((char*)strings, encStr, encSize+1); } else { - uint16_t* strings = (uint16_t*)dat; + char16_t* strings = (char16_t*)dat; - ENCODE_LENGTH(strings, sizeof(uint16_t), strSize) + ENCODE_LENGTH(strings, sizeof(char16_t), strSize) strcpy16_htod(strings, ent.value); } |