summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-03-06 12:23:34 -0800
committerElliott Hughes <enh@google.com>2015-03-06 12:23:34 -0800
commita04b5c3d39232c7616591883ee2124520e3ab622 (patch)
tree2e16d3a26438e9e7e25635a92e1ffa221d71fda9 /include
parentf6681759e51d8e22f871a0f826baab53e02717f1 (diff)
downloadlibcore-a04b5c3d39232c7616591883ee2124520e3ab622.zip
libcore-a04b5c3d39232c7616591883ee2124520e3ab622.tar.gz
libcore-a04b5c3d39232c7616591883ee2124520e3ab622.tar.bz2
Explicitly specify the icu:: namespace.
Bug: 15350832 Change-Id: I8d84f3e50b643806ccf01190797c69ce6445b539
Diffstat (limited to 'include')
-rw-r--r--include/ScopedIcuLocale.h6
-rw-r--r--include/ScopedJavaUnicodeString.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/ScopedIcuLocale.h b/include/ScopedIcuLocale.h
index 2109e03..64186e3 100644
--- a/include/ScopedIcuLocale.h
+++ b/include/ScopedIcuLocale.h
@@ -36,7 +36,7 @@ class ScopedIcuLocale {
return;
}
- mLocale = Locale::createFromName(localeName.c_str());
+ mLocale = icu::Locale::createFromName(localeName.c_str());
}
~ScopedIcuLocale() {
@@ -46,13 +46,13 @@ class ScopedIcuLocale {
return !mLocale.isBogus();
}
- Locale& locale() {
+ icu::Locale& locale() {
return mLocale;
}
private:
JNIEnv* const mEnv;
- Locale mLocale;
+ icu::Locale mLocale;
// Disallow copy and assignment.
ScopedIcuLocale(const ScopedIcuLocale&);
diff --git a/include/ScopedJavaUnicodeString.h b/include/ScopedJavaUnicodeString.h
index f6ed7ad..c1f487e 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&);