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

Side by Side Diff: third_party/re2/patches/re2-android.patch

Issue 12033058: Updated to most recent version RE2 and remove upstreamed patches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/re2/patches/msvc-x64.patch ('k') | third_party/re2/patches/re2-msvc9-chrome.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/third_party/re2/re2/parse.cc b/third_party/re2/re2/parse.cc 1 diff --git a/util/util.h b/util/util.h
2 index 0cf4ab4..6423fe9 100644 2 index 17ef824..8f54040 100644
3 --- a/third_party/re2/re2/parse.cc 3 --- a/util/util.h
4 +++ b/third_party/re2/re2/parse.cc 4 +++ b/util/util.h
5 @@ -16,6 +16,8 @@ 5 @@ -29,6 +29,7 @@
6 // and recognizes the Perl escape sequences \d, \s, \w, \D, \S, and \W.
7 // See regexp.h for rationale.
8
9 +#include <ctype.h>
10 +
11 #include "util/util.h"
12 #include "re2/regexp.h"
13 #include "re2/stringpiece.h"
14 diff --git a/third_party/re2/re2/re2.cc b/third_party/re2/re2/re2.cc
15 index 989add6..78978f1 100644
16 --- a/third_party/re2/re2/re2.cc
17 +++ b/third_party/re2/re2/re2.cc
18 @@ -9,6 +9,8 @@
19
20 #include "re2/re2.h"
21
22 +#include <ctype.h>
23 +
24 #include <stdio.h>
25 #include <string>
26 #ifdef WIN32
27 diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
28 index dab7e16..11b5f4a 100644
29 --- a/third_party/re2/util/util.h
30 +++ b/third_party/re2/util/util.h
31 @@ -28,6 +28,7 @@
32 #include <utility> 6 #include <utility>
33 #include <set> 7 #include <set>
34 8
35 +#include "build/build_config.h" 9 +#include "build/build_config.h"
36 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" 10 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
37 11
38 // Use std names. 12 // Use std names.
39 @@ -44,7 +45,7 @@ using std::sort; 13 @@ -45,7 +46,7 @@ using std::sort;
40 using std::swap; 14 using std::swap;
41 using std::make_pair; 15 using std::make_pair;
42 16
43 -#if defined(__GNUC__) && !defined(USE_CXX0X) 17 -#if defined(__GNUC__) && !defined(USE_CXX0X)
44 +#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) 18 +#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID)
45 19
46 #include <tr1/unordered_set> 20 #include <tr1/unordered_set>
47 using std::tr1::unordered_set; 21 using std::tr1::unordered_set;
48 @@ -52,7 +53,7 @@ using std::tr1::unordered_set; 22 @@ -53,7 +54,7 @@ using std::tr1::unordered_set;
49 #else 23 #else
50 24
51 #include <unordered_set> 25 #include <unordered_set>
52 -#ifdef WIN32 26 -#ifdef WIN32
53 +#if defined(WIN32) || defined(OS_ANDROID) 27 +#if defined(WIN32) || defined(OS_ANDROID)
54 using std::tr1::unordered_set; 28 using std::tr1::unordered_set;
55 #else 29 #else
56 using std::unordered_set; 30 using std::unordered_set;
OLDNEW
« no previous file with comments | « third_party/re2/patches/msvc-x64.patch ('k') | third_party/re2/patches/re2-msvc9-chrome.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698