diff options
| author | Fredrik Roubert <roubert@google.com> | 2017-04-06 22:04:33 +0200 |
|---|---|---|
| committer | Fredrik Roubert <roubert@google.com> | 2017-07-17 13:16:37 +0200 |
| commit | 37f866f8068fce60d5af005d7f3ab039c08faf08 (patch) | |
| tree | e6adae6f6c5eec5d21110f0ad24160f2e1a0f201 /include/ScopedJavaUnicodeString.h | |
| parent | 99b6b9dc2d2982fa69982deb958a8c7bb371dff6 (diff) | |
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
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
| -rw-r--r-- | include/ScopedJavaUnicodeString.h | 2 |
1 files changed, 1 insertions, 1 deletions
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. |