diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-08 18:28:00 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-08 18:30:08 -0700 |
| commit | f348c15ecf78e9d58b8238ffcf1d78a279e3a862 (patch) | |
| tree | fad413b2f2b3d849eaf83e607a8336683adb8b63 /tools/aapt/StringPool.cpp | |
| parent | 2a1ed46decbc8e21a39367a4b7770111392167c3 (diff) | |
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
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 158b39196cb3..c7fd0405163c 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); } |