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 |
index fc4dd1c90ab2ae6fb32d77d59f1a342abc9dfec3..d4fec7740a57a3382e898c0797e9eefb5142bb20 100644 |
--- a/third_party/re2/patches/re2-libcxx.patch |
+++ b/third_party/re2/patches/re2-libcxx.patch |
@@ -2,13 +2,12 @@ diff --git a/third_party/re2/util/util.h b/third_party/re2/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; |
+@@ -46,7 +46,7 @@ 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) |
+-#if defined(__GNUC__) && !defined(USE_CXX0X) |
++#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(_LIBCPP_ABI_VERSION) |
#include <tr1/unordered_set> |
using std::tr1::unordered_set; |