Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2955)

Unified Diff: base/strings/string_util.cc

Issue 951983002: Reland "Enable libc++ on Android" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Final rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/strings/string_util.cc
diff --git a/base/strings/string_util.cc b/base/strings/string_util.cc
index e084cb5597da6cbdcb50d0c3ce958bbc8dbc220e..59e5efc2bf507817feacdcaad7e2a1a2b6095988 100644
--- a/base/strings/string_util.cc
+++ b/base/strings/string_util.cc
@@ -454,8 +454,8 @@ bool LowerCaseEqualsASCII(string16::const_iterator a_begin,
return DoLowerCaseEqualsASCII(a_begin, a_end, b);
}
-// TODO(port): Resolve wchar_t/iterator issues that require OS_ANDROID here.
-#if !defined(OS_ANDROID)
+// TODO(jdduke): Remove guards after complete adoption of libc++ on Android.
+#if !defined(OS_ANDROID) || !defined(USE_STLPORT)
bool LowerCaseEqualsASCII(const char* a_begin,
const char* a_end,
const char* b) {
@@ -467,8 +467,7 @@ bool LowerCaseEqualsASCII(const char16* a_begin,
const char* b) {
return DoLowerCaseEqualsASCII(a_begin, a_end, b);
}
-
-#endif // !defined(OS_ANDROID)
+#endif // !defined(OS_ANDROID) || !defined(USE_STLPORT)
bool EqualsASCII(const string16& a, const base::StringPiece& b) {
if (a.length() != b.length())
« no previous file with comments | « base/containers/hash_tables.h ('k') | build/android/setup.gyp » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698