From 37f866f8068fce60d5af005d7f3ab039c08faf08 Mon Sep 17 00:00:00 2001 From: Fredrik Roubert Date: Thu, 6 Apr 2017 22:04:33 +0200 Subject: Update JNI code in preparation for ICU 59 switching to C++11 char16_t. ICU 59 (update pending on the aosp/icu59 branch) has switched to using the C++11 char16_t data type, which is a distinct type from uint16_t (which is what JNI's jchar is typedef'd as), even though they are bitwise identical. All code that passes UTF-16 data between ICU4C and JNI must therefore be updated with typecasts in the appropriate places before ICU 59 is merged to aosp/master. Bug: 37554848 Test: make Change-Id: I10808c4104e9dabfd90975ee61c465b22ff30281 --- include/ScopedJavaUnicodeString.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/ScopedJavaUnicodeString.h') diff --git a/include/ScopedJavaUnicodeString.h b/include/ScopedJavaUnicodeString.h index c1f487e46e..4e74ee1040 100644 --- a/include/ScopedJavaUnicodeString.h +++ b/include/ScopedJavaUnicodeString.h @@ -56,7 +56,7 @@ class ScopedJavaUnicodeString { private: JNIEnv* mEnv; jstring mString; - const UChar* mChars; + const jchar* mChars; icu::UnicodeString mUnicodeString; // Disallow copy and assignment. -- cgit v1.2.3