diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-09 04:37:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-09 04:37:42 +0000 |
| commit | 6c585756b4c66058af85bb8d6524ffa94af79e62 (patch) | |
| tree | 4fe00d850ec26a714b8d8832ec1d4624c1d7a6b4 /tools/aapt/StringPool.cpp | |
| parent | de86cf1362ef0461b589fa85bdd5c58921010c6a (diff) | |
| parent | 2ffa4aabd76353a907ee89a3e0c6f1961237f257 (diff) | |
| download | frameworks_base-6c585756b4c66058af85bb8d6524ffa94af79e62.zip frameworks_base-6c585756b4c66058af85bb8d6524ffa94af79e62.tar.gz frameworks_base-6c585756b4c66058af85bb8d6524ffa94af79e62.tar.bz2 | |
am 2ffa4aab: Merge "Use char16_t for char things."
* commit '2ffa4aabd76353a907ee89a3e0c6f1961237f257':
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); } |