OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/47387 (AIX ctype 'mask' override not working)

Browse Source 
2011-01-24  Graham Reed  <greed@pobox.com>

	PR libstdc++/47387
	* config/os/aix/ctype_inline.h (ctype<char>::is): Use _M_table if
	provided.

From-SVN: r169178
This commit is contained in:
Graham Reed 2011-01-24 19:53:35 +00:00 committed by Paolo Carlini
parent 9841210f04
commit 083fcbcbc3
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,15 +1,21 @@
2011-01-24 Graham Reed <greed@pobox.com>
PR libstdc++/47387
* config/os/aix/ctype_inline.h (ctype<char>::is): Use _M_table if
provided.
2011-01-24 Johannes Singler <singler@kit.edu>
PR libstdc++/47433
* include/parallel/losertree.h
(_LoserTree<>::__delete_min_insert):
Do not qualify swap with std:: for value type,
Do not qualify swap with std:: for value type,
but include a using directive instead.
(_LoserTreeUnguarded<>::__delete_min_insert): Likewise.
* include/parallel/balanced_quicksort.h (__qsb_divide):
Use std::iter_swap instead of std::swap.
(__qsb_local_sort_with_helping): Likewise.
* include/parallel/partition.h (__parallel_partition):
* include/parallel/partition.h (__parallel_partition):
Likewise. (__parallel_nth_element): Likewise.
2011-01-24 Johannes Singler <singler@kit.edu>

17
libstdc++-v3/config/os/aix/ctype_inline.h
View File

@ -1,6 +1,6 @@
// Locale support -*- C++ -*-
// Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
// Copyright (C) 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -39,14 +39,23 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
bool
ctype<char>::
is(mask __m, char __c) const
{ return __OBJ_DATA(__lc_ctype)->mask[__c] & __m; }
{
if(_M_table)
return _M_table[static_cast<unsigned char>(__c)] & __m;
else
return __OBJ_DATA(__lc_ctype)->mask[__c] & __m;
}
const char*
ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const
{
while (__low < __high)
*__vec++ = __OBJ_DATA(__lc_ctype)->mask[*__low++];
if(_M_table)
while (__low < __high)
*__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
else
while (__low < __high)
*__vec++ = __OBJ_DATA(__lc_ctype)->mask[*__low++];
return __high;
}