Merge Chromium + Blink git repositories
[chromium-blink-merge.git] / third_party / re2 / patches / re2-libcxx.patch
blob54f3b6bd62df02b53c5d22939f31c0f799e6dd46
1 diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
2 index 8f54040..de1ef5b 100644
3 --- a/third_party/re2/util/util.h
4 +++ b/third_party/re2/util/util.h
5 @@ -46,7 +46,8 @@ using std::sort;
6 using std::swap;
7 using std::make_pair;
9 -#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID)
10 +#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) && \
11 + !defined(_LIBCPP_ABI_VERSION)
13 #include <tr1/unordered_set>
14 using std::tr1::unordered_set;
15 @@ -54,1 +55,1 @@ using std::tr1::unordered_set;
16 #else
18 #include <unordered_set>
19 -#if defined(WIN32) || defined(OS_ANDROID)
20 +#if defined(WIN32) || (defined(OS_ANDROID) && !defined(_LIBCPP_ABI_VERSION))
21 using std::tr1::unordered_set;
22 #else
23 using std::unordered_set;