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

Unified Diff: third_party/re2/util/util.h

Issue 691783003: [WIP NOT FOR COMMIT] Switch Android to libc++ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add gn changes Created 6 years, 1 month 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: third_party/re2/util/util.h
diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
index 83504454b28c40c38dd8c4ac79f8d1782697904a..0c18583d232e8c769e97acf97050878e237736e5 100644
--- a/third_party/re2/util/util.h
+++ b/third_party/re2/util/util.h
@@ -55,7 +55,7 @@ using std::tr1::unordered_set;
#else
#include <unordered_set>
-#if defined(WIN32) || defined(OS_ANDROID)
+#if defined(WIN32)
Fabrice (no longer in Chrome) 2014/11/05 12:33:06 I'm not sure that is still necessary, we've been u
Nico 2014/11/05 17:30:10 Yes, but re2 is a third_party project and re2 can'
using std::tr1::unordered_set;
#else
using std::unordered_set;

Powered by Google App Engine
This is Rietveld 408576698