From a04b5c3d39232c7616591883ee2124520e3ab622 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 6 Mar 2015 12:23:34 -0800 Subject: Explicitly specify the icu:: namespace. Bug: 15350832 Change-Id: I8d84f3e50b643806ccf01190797c69ce6445b539 --- include/ScopedJavaUnicodeString.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/ScopedJavaUnicodeString.h') diff --git a/include/ScopedJavaUnicodeString.h b/include/ScopedJavaUnicodeString.h index f6ed7ad11d..c1f487e46e 100644 --- a/include/ScopedJavaUnicodeString.h +++ b/include/ScopedJavaUnicodeString.h @@ -45,11 +45,11 @@ class ScopedJavaUnicodeString { return (mString != NULL); } - const UnicodeString& unicodeString() const { + const icu::UnicodeString& unicodeString() const { return mUnicodeString; } - UnicodeString& unicodeString() { + icu::UnicodeString& unicodeString() { return mUnicodeString; } @@ -57,7 +57,7 @@ class ScopedJavaUnicodeString { JNIEnv* mEnv; jstring mString; const UChar* mChars; - UnicodeString mUnicodeString; + icu::UnicodeString mUnicodeString; // Disallow copy and assignment. ScopedJavaUnicodeString(const ScopedJavaUnicodeString&); -- cgit v1.2.3