PR libstdc++/28080 (final)

2007-03-11  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/28080 (final)
	* include/std/iosfwd: Do not include <bits/c++io.h>.
	* config/io/basic_file_stdio.h: Do it here.
	* include/ext/stdio_sync_filebuf.h: Likewise.
	* include/ext/rope: Include <bits/gthr.h> unconditionally.
	* include/std/fstream: Do not include <bits/gthr.h>.

	* include/std/ios: Do not include <cstdio>.
	* include/bits/ios_base.h: Do it here.
	* testsuite/27_io/ios_base/cons/assign_neg.cc: Adjust dg-error
	line numbers.
	* testsuite/27_io/ios_base/cons/copy_neg.cc: Likewise.

From-SVN: r122818

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 24dabcf2d781cf9b653aef7da845c59d8a145787..73d77bc49cf96a1219b9f27bfd55e124ee208a4f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,18 @@
+2007-03-11  Paolo Carlini  <pcarlini@suse.de>
+
+       PR libstdc++/28080 (final)
+       * include/std/iosfwd: Do not include <bits/c++io.h>.
+       * config/io/basic_file_stdio.h: Do it here.
+       * include/ext/stdio_sync_filebuf.h: Likewise.
+       * include/ext/rope: Include <bits/gthr.h> unconditionally.
+       * include/std/fstream: Do not include <bits/gthr.h>.
+       
+       * include/std/ios: Do not include <cstdio>.
+       * include/bits/ios_base.h: Do it here.
+       * testsuite/27_io/ios_base/cons/assign_neg.cc: Adjust dg-error
+       line numbers.
+       * testsuite/27_io/ios_base/cons/copy_neg.cc: Likewise.
+
 2007-03-10  Paolo Carlini  <pcarlini@suse.de>
 
        PR libstdc++/28080 (partial)

diff --git a/libstdc++-v3/config/io/basic_file_stdio.h b/libstdc++-v3/config/io/basic_file_stdio.h
index 175d13afd3cbbcdbe434b3e2f5366e25ed8fd1f8..bf2d5b3162b1c7134339a2e9d32f8efbf55d2e31 100644 (file)
--- a/libstdc++-v3/config/io/basic_file_stdio.h
+++ b/libstdc++-v3/config/io/basic_file_stdio.h
@@ -1,6 +1,6 @@
 // Wrapper of C-language FILE struct -*- C++ -*-
 
-// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -43,6 +43,7 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
+#include <bits/c++io.h>  // for __c_lock and __c_file
 #include <ios>
 
 _GLIBCXX_BEGIN_NAMESPACE(std)

diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h
index 33dc256a4cf3ffbd151e8f389f2cb859001f4157..e0bbfc3742557e447081540fc2ce3363c3a0218b 100644 (file)
--- a/libstdc++-v3/include/bits/ios_base.h
+++ b/libstdc++-v3/include/bits/ios_base.h
@@ -1,6 +1,7 @@
 // Iostreams base classes -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -45,6 +46,7 @@
 #include <ext/atomicity.h>
 #include <bits/localefwd.h>
 #include <bits/locale_classes.h>
+#include <cstdio>  // For SEEK_CUR, SEEK_END
 
 _GLIBCXX_BEGIN_NAMESPACE(std)
 

diff --git a/libstdc++-v3/include/ext/rope b/libstdc++-v3/include/ext/rope
index 45c5de85dad1bbda91e11d151f933b8a72206446..0bc371cd116854dd90111599b198e3e95b9a666f 100644 (file)
--- a/libstdc++-v3/include/ext/rope
+++ b/libstdc++-v3/include/ext/rope
@@ -58,11 +58,11 @@
 #include <bits/allocator.h>
 #include <ext/hash_fun.h>
 #include <iosfwd>
+#include <bits/gthr.h>
 
 # ifdef __GC
 #   define __GC_CONST const
 # else
-#   include <bits/gthr.h>
 #   define __GC_CONST   // constant except for deallocation
 # endif
 

diff --git a/libstdc++-v3/include/ext/stdio_sync_filebuf.h b/libstdc++-v3/include/ext/stdio_sync_filebuf.h
index f0ec12c3a695aaf66eeca6c121468dd56810c57c..a1d2b385daa3767567aeabb094378b8d6595a933 100644 (file)
--- a/libstdc++-v3/include/ext/stdio_sync_filebuf.h
+++ b/libstdc++-v3/include/ext/stdio_sync_filebuf.h
@@ -1,6 +1,6 @@
 // Iostreams wrapper for stdio FILE* -*- C++ -*-
 
-// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005, 2006, 2007 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,6 +39,7 @@
 #include <streambuf>
 #include <unistd.h>
 #include <cstdio>
+#include <bits/c++io.h>  // For __c_file
 
 #ifdef _GLIBCXX_USE_WCHAR_T
 #include <cwchar>

diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream
index adcf3eb7c6e2579dfb6cc5d6c5ab2e199f846c2d..0687905e2621c4e3d4e23b810124bf0b3cc36e6f 100644 (file)
--- a/libstdc++-v3/include/std/fstream
+++ b/libstdc++-v3/include/std/fstream
@@ -1,6 +1,7 @@
 // File based streams -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -44,9 +45,8 @@
 #include <istream>
 #include <ostream>
 #include <locale>      // For codecvt
-#include <cstdio>       // For SEEK_SET, SEEK_CUR, SEEK_END, BUFSIZ     
-#include <bits/basic_file.h>
-#include <bits/gthr.h>
+#include <cstdio>       // For BUFSIZ     
+#include <bits/basic_file.h>  // For __basic_file, __c_lock
 
 _GLIBCXX_BEGIN_NAMESPACE(std)
 

diff --git a/libstdc++-v3/include/std/ios b/libstdc++-v3/include/std/ios
index 95d845081cdd8c1e6495d573c1532fa61cd1b398..e545b89aacdde821a1ce70f7bcea548b57204243 100644 (file)
--- a/libstdc++-v3/include/std/ios
+++ b/libstdc++-v3/include/std/ios
@@ -1,6 +1,7 @@
 // Iostreams base classes -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+// 2005, 2006, 2007 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
@@ -43,7 +44,6 @@
 #include <iosfwd>
 #include <exception>           // For ios_base::failure
 #include <bits/char_traits.h>  // For char_traits, streamoff, streamsize, fpos
-#include <cstdio>      // For SEEK_SET, SEEK_CUR, SEEK_END
 #include <bits/localefwd.h>    // For class locale
 #include <bits/ios_base.h>     // For ios_base declarations.
 #include <streambuf> 

diff --git a/libstdc++-v3/include/std/iosfwd b/libstdc++-v3/include/std/iosfwd
index f80d34b607ef1096edf5b183e22a48dda9f0a2c8..bf23f18f68cb89a500291fdc2ce873b9540f805f 100644 (file)
--- a/libstdc++-v3/include/std/iosfwd
+++ b/libstdc++-v3/include/std/iosfwd
@@ -44,7 +44,6 @@
 
 #include <bits/c++config.h>
 #include <bits/c++locale.h> 
-#include <bits/c++io.h> 
 #include <bits/stringfwd.h>    // For string forward declarations.
 #include <bits/postypes.h>
 #include <bits/functexcept.h>

diff --git a/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc b/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc
index e7a794fd228b98a687edd0043f88e5c5267363c6..04bd27575ce81179a3195b2375811372f47bb2f0 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc
@@ -1,6 +1,6 @@
 // { dg-do compile }
 
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005, 2006, 2007 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
@@ -42,5 +42,5 @@ void test01()
 }
 // { dg-error "synthesized" "" { target *-*-* } 41 } 
 // { dg-error "within this context" "" { target *-*-* } 34 } 
-// { dg-error "is private" "" { target *-*-* } 782 } 
+// { dg-error "is private" "" { target *-*-* } 784 } 
 // { dg-error "operator=" "" { target *-*-* } 0 } 

diff --git a/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc b/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc
index 80c3315185558a6f39d45fc04d882920ceb733f0..6d7ae39fbde49fd0178ce4a2b2d9ab4cfb551974 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc
@@ -1,6 +1,6 @@
 // { dg-do compile }
 
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005, 2006, 2007 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
@@ -42,5 +42,5 @@ void test02()
 }
 // { dg-error "within this context" "" { target *-*-* } 35 } 
 // { dg-error "synthesized" "" { target *-*-* } 41 } 
-// { dg-error "is private" "" { target *-*-* } 779 } 
+// { dg-error "is private" "" { target *-*-* } 781 } 
 // { dg-error "copy constructor" "" { target *-*-* } 0 }