Index: libcxx/include/locale =================================================================== --- libcxx/include/locale +++ libcxx/include/locale @@ -546,7 +546,7 @@ char __x = __src[__f]; if (__x == '-' || __x == '+') { - if (__a_end == __a || (__a_end[-1] & 0x5F) == (__exp & 0x7F)) + if (__a_end == __a || (_VSTD::toupper(__a_end[-1]) == _VSTD::toupper(__exp))) { *__a_end++ = __x; return 0; @@ -555,9 +555,9 @@ } if (__x == 'x' || __x == 'X') __exp = 'P'; - else if ((__x & 0x5F) == __exp) + else if (_VSTD::toupper(__x) == __exp) { - __exp |= (char) 0x80; + __exp = _VSTD::tolower(__exp); if (__in_units) { __in_units = false;