From bd91a8c4edadd47b17270c27e222cdca9472b534 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sun, 11 Mar 2007 12:03:34 +0000 Subject: [PATCH] PR libstdc++/28080 (final) 2007-03-11 Paolo Carlini PR libstdc++/28080 (final) * include/std/iosfwd: Do not include . * config/io/basic_file_stdio.h: Do it here. * include/ext/stdio_sync_filebuf.h: Likewise. * include/ext/rope: Include unconditionally. * include/std/fstream: Do not include . * include/std/ios: Do not include . * 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 --- libstdc++-v3/ChangeLog | 15 +++++++++++++++ libstdc++-v3/config/io/basic_file_stdio.h | 3 ++- libstdc++-v3/include/bits/ios_base.h | 4 +++- libstdc++-v3/include/ext/rope | 2 +- libstdc++-v3/include/ext/stdio_sync_filebuf.h | 3 ++- libstdc++-v3/include/std/fstream | 8 ++++---- libstdc++-v3/include/std/ios | 4 ++-- libstdc++-v3/include/std/iosfwd | 1 - .../testsuite/27_io/ios_base/cons/assign_neg.cc | 4 ++-- .../testsuite/27_io/ios_base/cons/copy_neg.cc | 4 ++-- 10 files changed, 33 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 24dabcf2d781..73d77bc49cf9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,18 @@ +2007-03-11 Paolo Carlini + + PR libstdc++/28080 (final) + * include/std/iosfwd: Do not include . + * config/io/basic_file_stdio.h: Do it here. + * include/ext/stdio_sync_filebuf.h: Likewise. + * include/ext/rope: Include unconditionally. + * include/std/fstream: Do not include . + + * include/std/ios: Do not include . + * 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 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 175d13afd3cb..bf2d5b3162b1 100644 --- 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 +#include // for __c_lock and __c_file #include _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h index 33dc256a4cf3..e0bbfc374255 100644 --- 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 #include #include +#include // For SEEK_CUR, SEEK_END _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/ext/rope b/libstdc++-v3/include/ext/rope index 45c5de85dad1..0bc371cd1168 100644 --- a/libstdc++-v3/include/ext/rope +++ b/libstdc++-v3/include/ext/rope @@ -58,11 +58,11 @@ #include #include #include +#include # ifdef __GC # define __GC_CONST const # else -# include # 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 f0ec12c3a695..a1d2b385daa3 100644 --- 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 #include #include +#include // For __c_file #ifdef _GLIBCXX_USE_WCHAR_T #include diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream index adcf3eb7c6e2..0687905e2621 100644 --- 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 #include #include // For codecvt -#include // For SEEK_SET, SEEK_CUR, SEEK_END, BUFSIZ -#include -#include +#include // For BUFSIZ +#include // For __basic_file, __c_lock _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/std/ios b/libstdc++-v3/include/std/ios index 95d845081cdd..e545b89aacdd 100644 --- 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 #include // For ios_base::failure #include // For char_traits, streamoff, streamsize, fpos -#include // For SEEK_SET, SEEK_CUR, SEEK_END #include // For class locale #include // For ios_base declarations. #include diff --git a/libstdc++-v3/include/std/iosfwd b/libstdc++-v3/include/std/iosfwd index f80d34b607ef..bf23f18f68cb 100644 --- a/libstdc++-v3/include/std/iosfwd +++ b/libstdc++-v3/include/std/iosfwd @@ -44,7 +44,6 @@ #include #include -#include #include // For string forward declarations. #include #include 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 e7a794fd228b..04bd27575ce8 100644 --- 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 80c331518555..6d7ae39fbde4 100644 --- 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 } -- 2.47.2