libstdc++-v3/

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>.

--- gcc-4.6-20100605/libstdc++-v3/include/c_global/cwctype.~1~	2010-02-04 19:20:34.000000000 +0100
+++ gcc-4.6-20100605/libstdc++-v3/include/c_global/cwctype	2010-06-08 14:34:39.000000000 +0200
@@ -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
 
--- gcc-4.6-20100605/libstdc++-v3/include/c_std/cwctype.~1~	2010-02-04 19:20:34.000000000 +0100
+++ gcc-4.6-20100605/libstdc++-v3/include/c_std/cwctype	2010-06-08 14:34:34.000000000 +0200
@@ -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
--- gcc-4.6-20100605/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc.~1~	2009-07-24 22:55:59.000000000 +0200
+++ gcc-4.6-20100605/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc	2010-06-08 14:34:43.000000000 +0200
@@ -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();
--- gcc-4.6-20100605/libstdc++-v3/testsuite/util/testsuite_abi.h.~1~	2010-06-05 15:13:46.000000000 +0200
+++ gcc-4.6-20100605/libstdc++-v3/testsuite/util/testsuite_abi.h	2010-06-08 14:34:50.000000000 +0200
@@ -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>
--- gcc-4.6-20100605/libstdc++-v3/testsuite/util/testsuite_allocator.h.~1~	2010-06-03 21:15:56.000000000 +0200
+++ gcc-4.6-20100605/libstdc++-v3/testsuite/util/testsuite_allocator.h	2010-06-08 14:34:53.000000000 +0200
@@ -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;