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.h | |
| 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.h')
| -rw-r--r-- | tools/aapt/StringPool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/StringPool.h b/tools/aapt/StringPool.h index 1b3abfd9b4c6..1b5a7ba6b009 100644 --- a/tools/aapt/StringPool.h +++ b/tools/aapt/StringPool.h @@ -26,7 +26,7 @@ using namespace android; #define PRINT_STRING_METRICS 0 -void strcpy16_htod(uint16_t* dst, const uint16_t* src); +void strcpy16_htod(char16_t* dst, const char16_t* src); void printStringPool(const ResStringPool* pool); |