Chromium Code Reviews| Index: third_party/re2/patches/re2-libcxx.patch |
| diff --git a/third_party/re2/patches/re2-libcxx.patch b/third_party/re2/patches/re2-libcxx.patch |
| deleted file mode 100644 |
| index 54f3b6bd62df02b53c5d22939f31c0f799e6dd46..0000000000000000000000000000000000000000 |
| --- a/third_party/re2/patches/re2-libcxx.patch |
| +++ /dev/null |
| @@ -1,23 +0,0 @@ |
| -diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h |
|
battre
2015/12/10 13:32:05
This has been solved by util/util.h
|
| -index 8f54040..de1ef5b 100644 |
| ---- a/third_party/re2/util/util.h |
| -+++ b/third_party/re2/util/util.h |
| -@@ -46,7 +46,8 @@ using std::sort; |
| - using std::swap; |
| - using std::make_pair; |
| - |
| --#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) |
| -+#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) && \ |
| -+ !defined(_LIBCPP_ABI_VERSION) |
| - |
| - #include <tr1/unordered_set> |
| - using std::tr1::unordered_set; |
| -@@ -54,1 +55,1 @@ using std::tr1::unordered_set; |
| - #else |
| - |
| - #include <unordered_set> |
| --#if defined(WIN32) || defined(OS_ANDROID) |
| -+#if defined(WIN32) || (defined(OS_ANDROID) && !defined(_LIBCPP_ABI_VERSION)) |
| - using std::tr1::unordered_set; |
| - #else |
| - using std::unordered_set; |