diff options
Diffstat (limited to 'README.android')
| -rw-r--r-- | README.android | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/README.android b/README.android index 453cd80..4911c3c 100644 --- a/README.android +++ b/README.android @@ -1,29 +1,28 @@ -Code obtained via ------------------ -hg clone https://re2.googlecode.com/hg re2 +Code obtained from +------------------ + +https://re2.googlecode.com/files/re2-20130115.tgz Version ------- -hg identify -2d252384c5e8 tip +re2-20130115.tgz Changes required to build using stlport on Android as follows (full diff) ------------------------------------------------------------------------- -diff -r ./re2/parse.cc /home/idh/temp9/re2/re2/parse.cc -19d18 -< #include <ctype.h> -diff -r ./re2/re2.cc /home/idh/temp9/re2/re2/re2.cc -13d12 -< #include <ctype.h> -Only in /home/idh/temp9/re2/re2: testing -diff -r ./util/util.h /home/idh/temp9/re2/util/util.h -43,48c43 +util/util.h: + +44,53c44 < #if defined(ANDROID) < -< #include <unordered_set> +< #if defined(_STLPORT_VERSION) +< #include <unordered_set> // using stlport +< #else +< #include <tr1/unordered_set> // using gnustl +< #endif < using std::tr1::unordered_set; -< +< < #elif defined(__GNUC__) && !defined(USE_CXX0X) --- > #if defined(__GNUC__) && !defined(USE_CXX0X) + |