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

re PR libstdc++/44417 (make check-target-libstdc++-v3 fails due to undefined ptrdiff_t)

Browse Source 
2010-06-07  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/44417
	* include/c_std/cwctype: Provide a workaround for bug glibc
	BZ 9694 affecting glibc 2.9 and older.
	* include/c_global/cwctype: Likewise.
	* testsuite/util/testsuite_abi.h: Remove temporary workaround.
	* testsuite/util/testsuite_allocator.h: Use everywhere std::size_t
	and std::ptrdiff_t, don't include <cstddef>.

	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	error_code.cc: Minor tweak, prefer <cwchar> to <wchar.h>.

From-SVN: r160417
This commit is contained in:
Paolo Carlini 2010-06-08 01:46:10 +00:00 committed by Paolo Carlini
parent 567d4027a3
commit c8061de73f
6 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,16 @@
2010-06-07 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/44417
* include/c_std/cwctype: Provide a workaround for bug glibc
BZ 9694 affecting glibc 2.9 and older.
* include/c_global/cwctype: Likewise.
* testsuite/util/testsuite_abi.h: Remove temporary workaround.
* testsuite/util/testsuite_allocator.h: Use everywhere std::size_t
and std::ptrdiff_t, don't include <cstddef>.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
error_code.cc: Minor tweak, prefer <cwchar> to <wchar.h>.
2010-06-07 Paolo Carlini <paolo.carlini@oracle.com>
* include/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp:

8
libstdc++-v3/include/c_global/cwctype
View File

@ -43,9 +43,15 @@
#include <bits/c++config.h>
#if _GLIBCXX_HAVE_WCTYPE_H
#include <wctype.h>
#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
// Work around glibc BZ 9694
#include <stddef.h>
#endif
#include <wctype.h>
#endif // _GLIBCXX_HAVE_WCTYPE_H
#ifndef _GLIBCXX_CWCTYPE
#define _GLIBCXX_CWCTYPE 1

8
libstdc++-v3/include/c_std/cwctype
View File

@ -45,9 +45,15 @@
#include <bits/c++config.h>
#if _GLIBCXX_HAVE_WCTYPE_H
#include <wctype.h>
#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
// Work around glibc BZ 9694
#include <stddef.h>
#endif
#include <wctype.h>
#endif // _GLIBCXX_HAVE_WCTYPE_H
// Get rid of those macros defined in <wctype.h> in lieu of real functions.
#undef iswalnum
#undef iswalpha

4
libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc
View File

@ -1,7 +1,7 @@
// { dg-options "-std=gnu++0x" }
// { dg-require-swprintf "" }
// Copyright (C) 2007, 2008, 2009 Free Software Foundation
// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation
//
// 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
@ -22,7 +22,7 @@
#include <sstream>
#include <system_error>
#include <algorithm>
#include <wchar.h>
#include <cwchar>
#include <testsuite_hooks.h>
// Effects: os << ec.category().name() << ':' << ec.value();

6
libstdc++-v3/testsuite/util/testsuite_abi.h
View File

@ -1,6 +1,7 @@
// -*- C++ -*-
// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
// Free Software Foundation, Inc.
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
@ -16,11 +17,8 @@
// along with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// Benjamin Kosnik <bkoz@redhat.com>
// Include stddef now to work around glibc BZ 9694
#include <stddef.h>
#include <string>
#include <stdexcept>
#include <vector>

5
libstdc++-v3/testsuite/util/testsuite_allocator.h
View File

@ -27,7 +27,6 @@
#ifndef _GLIBCXX_TESTSUITE_ALLOCATOR_H
#define _GLIBCXX_TESTSUITE_ALLOCATOR_H
#include <cstddef>
#include <tr1/unordered_map>
#include <cassert>
#include <bits/move.h>
@ -241,8 +240,8 @@ namespace __gnu_test
: private uneq_allocator_base
{
public:
typedef size_t size_type;
typedef ptrdiff_t difference_type;
typedef std::size_t size_type;
typedef std::ptrdiff_t difference_type;
typedef Tp* pointer;
typedef const Tp* const_pointer;
typedef Tp& reference;