| OLD | NEW |
| 1 diff -r cae1910ce3c5 re2/parse.cc | 1 diff --git a/third_party/re2/re2/parse.cc b/third_party/re2/re2/parse.cc |
| 2 --- a/re2/parse.cc» Mon Jul 30 16:12:46 2012 +0200 | 2 index 0cf4ab4..6423fe9 100644 |
| 3 +++ b/re2/parse.cc» Tue Jul 31 14:12:31 2012 +0200 | 3 --- a/third_party/re2/re2/parse.cc |
| 4 +++ b/third_party/re2/re2/parse.cc |
| 4 @@ -16,6 +16,8 @@ | 5 @@ -16,6 +16,8 @@ |
| 5 // and recognizes the Perl escape sequences \d, \s, \w, \D, \S, and \W. | 6 // and recognizes the Perl escape sequences \d, \s, \w, \D, \S, and \W. |
| 6 // See regexp.h for rationale. | 7 // See regexp.h for rationale. |
| 7 | 8 |
| 8 +#include <ctype.h> | 9 +#include <ctype.h> |
| 9 + | 10 + |
| 10 #include "util/util.h" | 11 #include "util/util.h" |
| 11 #include "re2/regexp.h" | 12 #include "re2/regexp.h" |
| 12 #include "re2/stringpiece.h" | 13 #include "re2/stringpiece.h" |
| 13 diff -r cae1910ce3c5 re2/re2.cc | 14 diff --git a/third_party/re2/re2/re2.cc b/third_party/re2/re2/re2.cc |
| 14 --- a/re2/re2.cc» Mon Jul 30 16:12:46 2012 +0200 | 15 index 989add6..78978f1 100644 |
| 15 +++ b/re2/re2.cc» Tue Jul 31 14:12:31 2012 +0200 | 16 --- a/third_party/re2/re2/re2.cc |
| 17 +++ b/third_party/re2/re2/re2.cc |
| 16 @@ -9,6 +9,8 @@ | 18 @@ -9,6 +9,8 @@ |
| 17 | 19 |
| 18 #include "re2/re2.h" | 20 #include "re2/re2.h" |
| 19 | 21 |
| 20 +#include <ctype.h> | 22 +#include <ctype.h> |
| 21 + | 23 + |
| 22 #include <stdio.h> | 24 #include <stdio.h> |
| 23 #include <string> | 25 #include <string> |
| 24 #ifdef WIN32 | 26 #ifdef WIN32 |
| 25 diff -r cae1910ce3c5 util/util.h | 27 diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h |
| 26 --- a/util/util.h» Mon Jul 30 16:12:46 2012 +0200 | 28 index dab7e16..11b5f4a 100644 |
| 27 +++ b/util/util.h» Tue Jul 31 14:12:31 2012 +0200 | 29 --- a/third_party/re2/util/util.h |
| 30 +++ b/third_party/re2/util/util.h |
| 28 @@ -28,6 +28,7 @@ | 31 @@ -28,6 +28,7 @@ |
| 29 #include <utility> | 32 #include <utility> |
| 30 #include <set> | 33 #include <set> |
| 31 | 34 |
| 32 +#include "build/build_config.h" | 35 +#include "build/build_config.h" |
| 33 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" | 36 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" |
| 34 | 37 |
| 35 // Use std names. | 38 // Use std names. |
| 36 @@ -44,7 +45,7 @@ | 39 @@ -44,7 +45,7 @@ using std::sort; |
| 37 using std::swap; | 40 using std::swap; |
| 38 using std::make_pair; | 41 using std::make_pair; |
| 39 | 42 |
| 40 -#if defined(__GNUC__) && !defined(USE_CXX0X) | 43 -#if defined(__GNUC__) && !defined(USE_CXX0X) |
| 41 +#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) | 44 +#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) |
| 42 | 45 |
| 43 #include <tr1/unordered_set> | 46 #include <tr1/unordered_set> |
| 44 using std::tr1::unordered_set; | 47 using std::tr1::unordered_set; |
| 45 @@ -52,7 +53,7 @@ | 48 @@ -52,7 +53,7 @@ using std::tr1::unordered_set; |
| 46 #else | 49 #else |
| 47 | 50 |
| 48 #include <unordered_set> | 51 #include <unordered_set> |
| 49 -#ifdef WIN32 | 52 -#ifdef WIN32 |
| 50 +#if defined(WIN32) || defined(OS_ANDROID) | 53 +#if defined(WIN32) || defined(OS_ANDROID) |
| 51 using std::tr1::unordered_set; | 54 using std::tr1::unordered_set; |
| 52 #else | 55 #else |
| 53 using std::unordered_set; | 56 using std::unordered_set; |
| OLD | NEW |