commit f348c15ecf78e9d58b8238ffcf1d78a279e3a862
author Dan Albert <danalbert@google.com> Mon Sep 08 18:28:00 2014 -0700
committer Dan Albert <danalbert@google.com> Mon Sep 08 18:30:08 2014 -0700
tree fad413b2f2b3d849eaf83e607a8336683adb8b63
parent 2a1ed46decbc8e21a39367a4b7770111392167c3

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

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index f7de558..4dc9bfc 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -253,7 +253,7 @@
         }
     }
     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();
 }
 
@@ -271,7 +271,7 @@
         }
     }
     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();
 }
 
@@ -325,7 +325,7 @@
     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);