From 142f1f3ac6032e21b069934c61a9bfa3c08c6e81 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 23 Jul 2014 19:32:03 +0000 Subject: [PATCH] Fix ctype_base::xdigit for Android. Android's ctype implementation comes from openbsd, which for some reason doesn't consider numbers to be hex digits. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@213785 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit d1ab521199792d5b811d4aa779fc04042e95eb3a) --- include/__locale | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/__locale b/include/__locale index 3daa1f1b6..c5c078756 100644 --- a/include/__locale +++ b/include/__locale @@ -366,7 +366,12 @@ public: static const mask alpha = _CTYPE_A; static const mask digit = _CTYPE_D; static const mask punct = _CTYPE_P; +# if defined(__ANDROID__) + static const mask xdigit = _CTYPE_X | _CTYPE_D; +# else static const mask xdigit = _CTYPE_X; +# endif + # if defined(__NetBSD__) static const mask blank = _CTYPE_BL; # else