[WIP NOT FOR COMMIT] Switch Android to libc++

third_party/re2/util/util.h

 // Copyright 2009 The RE2 Authors.  All Rights Reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 #ifndef RE2_UTIL_UTIL_H__
 #define RE2_UTIL_UTIL_H__
 
 // C
 #include <stdio.h>
 #include <string.h>
@@ skipping 28 matching lines @@
 using std::string;
 using std::min;
 using std::max;
 using std::ostream;
 using std::map;
 using std::stack;
 using std::sort;
 using std::swap;
 using std::make_pair;
 
 #if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) && \

[Nico, 2014/11/07 00:56:39]

I think the OS_ANDROID change here can be undone too.

I think you can revert all the changes in
third_party/re2/patches/re2-android.patch and delete that file (and update
third_party/re2/README.chromium to remove the mention of that patch)

[Fabrice (no longer in Chrome), 2014/11/12 11:52:29]

Done.

     !defined(_LIBCPP_ABI_VERSION)

[Fabrice (no longer in Chrome), 2014/11/05 12:33:06]

So, essentially Mac, right?

 
 #include <tr1/unordered_set>
 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 using a C++11-compliant STL on
Windows for a while, right?

[Nico, 2014/11/05 17:30:10]

Yes, but re2 is a third_party project and re2 can't assume this. We eventually
want to reduce our downstream diff for re2 to 0 and pull re2 via deps.

 using std::tr1::unordered_set;
 #else
 using std::unordered_set;
 #endif
 
 #endif
 
 namespace re2 {
 
 typedef int8_t int8;
@@ skipping 73 matching lines @@
 }
 
 }  // namespace re2
 
 #include "util/arena.h"
 #include "util/logging.h"
 #include "util/mutex.h"
 #include "util/utf.h"
 
 #endif // RE2_UTIL_UTIL_H__