generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move Android to the builtin rune table.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@231897 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Albert 2015-03-11 00:51:06 +00:00
parent 761d98d2f7
commit 6272ae58fe
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/__config
View File

@ -719,4 +719,8 @@ extern "C" void __sanitizer_annotate_contiguous_container(
_LIBCPP_HAS_NO_THREADS is defined. _LIBCPP_HAS_NO_THREADS is defined.
#endif #endif
#if defined(__ANDROID__)
#define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
#endif
#endif // _LIBCPP_CONFIG #endif // _LIBCPP_CONFIG

8
include/__locale
View File

@ -353,15 +353,13 @@ public:
static const mask punct = _PUNCT; static const mask punct = _PUNCT;
static const mask xdigit = _HEX; static const mask xdigit = _HEX;
static const mask blank = _BLANK; static const mask blank = _BLANK;
#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__) || defined(__ANDROID__) #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__)
# ifdef __APPLE__ # ifdef __APPLE__
typedef __uint32_t mask; typedef __uint32_t mask;
# elif defined(__FreeBSD__) # elif defined(__FreeBSD__)
typedef unsigned long mask; typedef unsigned long mask;
# elif defined(__EMSCRIPTEN__) || defined(__NetBSD__) # elif defined(__EMSCRIPTEN__) || defined(__NetBSD__)
typedef unsigned short mask; typedef unsigned short mask;
# elif defined(__ANDROID__)
typedef unsigned char mask;
# endif # endif
static const mask space = _CTYPE_S; static const mask space = _CTYPE_S;
static const mask print = _CTYPE_R; static const mask print = _CTYPE_R;
@ -371,11 +369,7 @@ public:
static const mask alpha = _CTYPE_A; static const mask alpha = _CTYPE_A;
static const mask digit = _CTYPE_D; static const mask digit = _CTYPE_D;
static const mask punct = _CTYPE_P; static const mask punct = _CTYPE_P;
# if defined(__ANDROID__)
static const mask xdigit = _CTYPE_X | _CTYPE_D;
# else
static const mask xdigit = _CTYPE_X; static const mask xdigit = _CTYPE_X;
# endif
# if defined(__NetBSD__) # if defined(__NetBSD__)
static const mask blank = _CTYPE_BL; static const mask blank = _CTYPE_BL;

2
src/locale.cpp
View File

@ -1119,8 +1119,6 @@ ctype<char>::classic_table() _NOEXCEPT
return _ctype_ + 1; return _ctype_ + 1;
#elif defined(_AIX) #elif defined(_AIX)
return (const unsigned int *)__lc_ctype_ptr->obj->mask; return (const unsigned int *)__lc_ctype_ptr->obj->mask;
#elif defined(__ANDROID__)
return reinterpret_cast<const unsigned char*>(_ctype_) + 1;
#else #else
// Platform not supported: abort so the person doing the port knows what to // Platform not supported: abort so the person doing the port knows what to
// fix // fix