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

re PR libstdc++/40511 (Bootstrap Failure in stage3: c++locale - Recent SVN) 

2009-06-30  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/40511
	* config/locale/gnu/c_locale.cc: Don't use LC_CTYPE_MASK together
	with glibc2.2.x.

From-SVN: r149089
This commit is contained in:
Paolo Carlini 2009-06-30 10:45:54 +00:00 committed by Paolo Carlini
parent 71d4d3eb2e
commit 0dca215363
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2009-06-30 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/40511
* config/locale/gnu/c_locale.cc: Don't use LC_CTYPE_MASK together
with glibc2.2.x.
2009-06-29 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/random.tcc

4
libstdc++-v3/config/locale/gnu/c_locale.cc
View File

@ -155,7 +155,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
if (__dup == __c_locale(0))
__throw_runtime_error(__N("locale::facet::_S_lc_ctype_c_locale "
"duplocale error"));
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__c_locale __changed = __newlocale(LC_CTYPE_MASK, __s, __dup);
#else
__c_locale __changed = __newlocale(1 << LC_CTYPE, __s, __dup);
#endif
if (__changed == __c_locale(0))
{
__freelocale(__dup);