2006-03-29 Benjamin Kosnik <bkoz@redhat.com>

	* testsuite/data/sgetn.txt:  Correct copyright holder.
	* testsuite/data/wistream_extractor_other-1.tst: Same.
	* testsuite/data/wistream_extractor_other-2.tst: Same.
	* testsuite/data/istream_extractor_other-1.txt: Same.
	* testsuite/data/filebuf_virtuals-1.txt: Same.
	* testsuite/data/wostream_inserter_other-1.tst: Same.
	* testsuite/data/wostream_inserter_other-2.tst: Same.
	* testsuite/data/ostream_inserter_other-1.tst: Same.
	* testsuite/data/ostream_inserter_other-2.tst: Same.
	* testsuite/data/wistream_extractor_other-1.txt: Same.
	* testsuite/data/istream_extractor_other-1.tst: Same.
	* testsuite/data/istream_extractor_other-2.tst: Same.
	* testsuite/data/filebuf_virtuals-1.tst: Same.
	* testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc: Adjust test
	conditions.
	* testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc: Same.
	* testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc: Same.
	* testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc: Same.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112514 138bc75d-0d04-0410-961f-82ee72b054a4

18 files changed, 56 insertions, 35 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4611906d75d..b0f2a3d52a3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,24 @@
+2006-03-29  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/data/sgetn.txt:  Correct copyright holder.
+	* testsuite/data/wistream_extractor_other-1.tst: Same.
+	* testsuite/data/wistream_extractor_other-2.tst: Same.
+	* testsuite/data/istream_extractor_other-1.txt: Same.
+	* testsuite/data/filebuf_virtuals-1.txt: Same.
+	* testsuite/data/wostream_inserter_other-1.tst: Same.
+	* testsuite/data/wostream_inserter_other-2.tst: Same.
+	* testsuite/data/ostream_inserter_other-1.tst: Same.
+	* testsuite/data/ostream_inserter_other-2.tst: Same.
+	* testsuite/data/wistream_extractor_other-1.txt: Same.
+	* testsuite/data/istream_extractor_other-1.tst: Same.
+	* testsuite/data/istream_extractor_other-2.tst: Same.
+	* testsuite/data/filebuf_virtuals-1.tst: Same.
+	* testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc: Adjust test
+	conditions.
+	* testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc: Same.
+	* testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc: Same.
+	* testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc: Same.
+
 2006-03-28  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/ext/vstring.h (operator[]): Allow s[s.size()] in
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc
index 59ec669915d..ace01a8c69f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc
@@ -1,6 +1,6 @@
 // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2006 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
@@ -73,7 +73,7 @@ void test05()
     strmsz_2 = fb_01.sgetn(carray2, strmsz_1 + 5);
     VERIFY( strmsz_1 == strmsz_2 - 5 ); 
     c4 = fb_01.sgetc(); // buffer should have underflowed from above.
-    VERIFY( c4 == 'h' );
+    VERIFY( c4 == 'e' );
     strmsz_1 = fb_01.in_avail();
     VERIFY( strmsz_1 > 0 );
     strmsz_2 = fb_01.sgetn(carray2, strmsz_1 + 5);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc
index 12f921adba9..79f0a66b9c6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc
@@ -1,6 +1,6 @@
 // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2006 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
@@ -86,7 +86,7 @@ void test05()
     strmsz_2 = fb_01.sgetn(carray2, strmsz_1 + 5);
     VERIFY( strmsz_1 == strmsz_2 - 5 ); 
     c4 = fb_01.sgetc(); // buffer should have underflowed from above.
-    VERIFY( c4 == 'h' );
+    VERIFY( c4 == 'e' );
     strmsz_1 = fb_01.in_avail();
     VERIFY( strmsz_1 > 0 );
     strmsz_2 = fb_01.sgetn(carray2, strmsz_1 + 5);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc
index 61f93cdd000..6bc69612221 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc
@@ -1,6 +1,6 @@
 // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2006 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
@@ -70,11 +70,11 @@ void test05()
     strmsz_2 = fb_01.sgetn(carray2, 8181 + 5);
     VERIFY( 8181 == strmsz_2 - 5 ); 
     c4 = fb_01.sgetc(); // buffer should have underflowed from above.
-    VERIFY( c4 == 'h' );
+    VERIFY( c4 == 'e' );
     strmsz_1 = fb_01.in_avail();
     VERIFY( strmsz_1 > 0 );
     strmsz_2 = fb_01.sgetn(carray2, 65 + 5);
-    VERIFY( 65 == strmsz_2 ); // at the end of the actual file 
+    VERIFY( 70 == strmsz_2 ); // at the end of the actual file 
     VERIFY( fb_01.unbuffered() );
   }
 }
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc
index b78f41f08f0..d9b2728bac6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc
@@ -1,6 +1,6 @@
 // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2006 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
@@ -82,11 +82,11 @@ void test05()
     strmsz_2 = fb_01.sgetn(carray2, 8181 + 5);
     VERIFY( 8181 == strmsz_2 - 5 ); 
     c4 = fb_01.sgetc(); // buffer should have underflowed from above.
-    VERIFY( c4 == 'h' );
+    VERIFY( c4 == 'e' );
     strmsz_1 = fb_01.in_avail();
     VERIFY( strmsz_1 > 0 );
     strmsz_2 = fb_01.sgetn(carray2, 65 + 5);
-    VERIFY( 65 == strmsz_2 ); //at the end of the actual file 
+    VERIFY( 70 == strmsz_2 ); //at the end of the actual file 
     VERIFY( fb_01.unbuffered() );
   }
 }
diff --git a/libstdc++-v3/testsuite/data/filebuf_virtuals-1.tst b/libstdc++-v3/testsuite/data/filebuf_virtuals-1.tst
index 57a6dab06ca..774f9bc546d 100644
--- a/libstdc++-v3/testsuite/data/filebuf_virtuals-1.tst
+++ b/libstdc++-v3/testsuite/data/filebuf_virtuals-1.tst
@@ -2,7 +2,7 @@
 // test functionality of basic_filebuf for char_type == char
 // this is a data file for 27filebuf.cc
 
-// Copyright (C) 1997-1999 Cygnus Solutions
+// Copyright (C) 1997-1999 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
@@ -17,7 +17,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/sarah_vaughan/sarah_vaughan.allofme
diff --git a/libstdc++-v3/testsuite/data/filebuf_virtuals-1.txt b/libstdc++-v3/testsuite/data/filebuf_virtuals-1.txt
index 57a6dab06ca..774f9bc546d 100644
--- a/libstdc++-v3/testsuite/data/filebuf_virtuals-1.txt
+++ b/libstdc++-v3/testsuite/data/filebuf_virtuals-1.txt
@@ -2,7 +2,7 @@
 // test functionality of basic_filebuf for char_type == char
 // this is a data file for 27filebuf.cc
 
-// Copyright (C) 1997-1999 Cygnus Solutions
+// Copyright (C) 1997-1999 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
@@ -17,7 +17,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/sarah_vaughan/sarah_vaughan.allofme
diff --git a/libstdc++-v3/testsuite/data/istream_extractor_other-1.tst b/libstdc++-v3/testsuite/data/istream_extractor_other-1.tst
index f96f60ad350..49d5a3be8da 100644
--- a/libstdc++-v3/testsuite/data/istream_extractor_other-1.tst
+++ b/libstdc++-v3/testsuite/data/istream_extractor_other-1.tst
@@ -1,6 +1,6 @@
 // 990811 bkoz
 
-// Copyright (C) 1999 Cygnus Solutions
+// Copyright (C) 1999 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
@@ -15,7 +15,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/yabbyyou_jesusdread/disk_2/King Tubby's - Repatriation
diff --git a/libstdc++-v3/testsuite/data/istream_extractor_other-1.txt b/libstdc++-v3/testsuite/data/istream_extractor_other-1.txt
index f96f60ad350..49d5a3be8da 100644
--- a/libstdc++-v3/testsuite/data/istream_extractor_other-1.txt
+++ b/libstdc++-v3/testsuite/data/istream_extractor_other-1.txt
@@ -1,6 +1,6 @@
 // 990811 bkoz
 
-// Copyright (C) 1999 Cygnus Solutions
+// Copyright (C) 1999 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
@@ -15,7 +15,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/yabbyyou_jesusdread/disk_2/King Tubby's - Repatriation
diff --git a/libstdc++-v3/testsuite/data/istream_extractor_other-2.tst b/libstdc++-v3/testsuite/data/istream_extractor_other-2.tst
index f96f60ad350..49d5a3be8da 100644
--- a/libstdc++-v3/testsuite/data/istream_extractor_other-2.tst
+++ b/libstdc++-v3/testsuite/data/istream_extractor_other-2.tst
@@ -1,6 +1,6 @@
 // 990811 bkoz
 
-// Copyright (C) 1999 Cygnus Solutions
+// Copyright (C) 1999 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
@@ -15,7 +15,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/yabbyyou_jesusdread/disk_2/King Tubby's - Repatriation
diff --git a/libstdc++-v3/testsuite/data/ostream_inserter_other-1.tst b/libstdc++-v3/testsuite/data/ostream_inserter_other-1.tst
index 57a6dab06ca..774f9bc546d 100644
--- a/libstdc++-v3/testsuite/data/ostream_inserter_other-1.tst
+++ b/libstdc++-v3/testsuite/data/ostream_inserter_other-1.tst
@@ -2,7 +2,7 @@
 // test functionality of basic_filebuf for char_type == char
 // this is a data file for 27filebuf.cc
 
-// Copyright (C) 1997-1999 Cygnus Solutions
+// Copyright (C) 1997-1999 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
@@ -17,7 +17,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/sarah_vaughan/sarah_vaughan.allofme
diff --git a/libstdc++-v3/testsuite/data/ostream_inserter_other-2.tst b/libstdc++-v3/testsuite/data/ostream_inserter_other-2.tst
index 57a6dab06ca..774f9bc546d 100644
--- a/libstdc++-v3/testsuite/data/ostream_inserter_other-2.tst
+++ b/libstdc++-v3/testsuite/data/ostream_inserter_other-2.tst
@@ -2,7 +2,7 @@
 // test functionality of basic_filebuf for char_type == char
 // this is a data file for 27filebuf.cc
 
-// Copyright (C) 1997-1999 Cygnus Solutions
+// Copyright (C) 1997-1999 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
@@ -17,7 +17,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/sarah_vaughan/sarah_vaughan.allofme
diff --git a/libstdc++-v3/testsuite/data/sgetn.txt b/libstdc++-v3/testsuite/data/sgetn.txt
index cb3c57f7dfd..774f9bc546d 100644
--- a/libstdc++-v3/testsuite/data/sgetn.txt
+++ b/libstdc++-v3/testsuite/data/sgetn.txt
@@ -2,7 +2,7 @@
 // test functionality of basic_filebuf for char_type == char
 // this is a data file for 27filebuf.cc
 
-// Copyright (C) 1997-1999 Cygnus Solutions
+// Copyright (C) 1997-1999 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
diff --git a/libstdc++-v3/testsuite/data/wistream_extractor_other-1.tst b/libstdc++-v3/testsuite/data/wistream_extractor_other-1.tst
index f96f60ad350..49d5a3be8da 100644
--- a/libstdc++-v3/testsuite/data/wistream_extractor_other-1.tst
+++ b/libstdc++-v3/testsuite/data/wistream_extractor_other-1.tst
@@ -1,6 +1,6 @@
 // 990811 bkoz
 
-// Copyright (C) 1999 Cygnus Solutions
+// Copyright (C) 1999 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
@@ -15,7 +15,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/yabbyyou_jesusdread/disk_2/King Tubby's - Repatriation
diff --git a/libstdc++-v3/testsuite/data/wistream_extractor_other-1.txt b/libstdc++-v3/testsuite/data/wistream_extractor_other-1.txt
index f96f60ad350..49d5a3be8da 100644
--- a/libstdc++-v3/testsuite/data/wistream_extractor_other-1.txt
+++ b/libstdc++-v3/testsuite/data/wistream_extractor_other-1.txt
@@ -1,6 +1,6 @@
 // 990811 bkoz
 
-// Copyright (C) 1999 Cygnus Solutions
+// Copyright (C) 1999 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
@@ -15,7 +15,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/yabbyyou_jesusdread/disk_2/King Tubby's - Repatriation
diff --git a/libstdc++-v3/testsuite/data/wistream_extractor_other-2.tst b/libstdc++-v3/testsuite/data/wistream_extractor_other-2.tst
index f96f60ad350..49d5a3be8da 100644
--- a/libstdc++-v3/testsuite/data/wistream_extractor_other-2.tst
+++ b/libstdc++-v3/testsuite/data/wistream_extractor_other-2.tst
@@ -1,6 +1,6 @@
 // 990811 bkoz
 
-// Copyright (C) 1999 Cygnus Solutions
+// Copyright (C) 1999 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
@@ -15,7 +15,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/yabbyyou_jesusdread/disk_2/King Tubby's - Repatriation
diff --git a/libstdc++-v3/testsuite/data/wostream_inserter_other-1.tst b/libstdc++-v3/testsuite/data/wostream_inserter_other-1.tst
index 57a6dab06ca..774f9bc546d 100644
--- a/libstdc++-v3/testsuite/data/wostream_inserter_other-1.tst
+++ b/libstdc++-v3/testsuite/data/wostream_inserter_other-1.tst
@@ -2,7 +2,7 @@
 // test functionality of basic_filebuf for char_type == char
 // this is a data file for 27filebuf.cc
 
-// Copyright (C) 1997-1999 Cygnus Solutions
+// Copyright (C) 1997-1999 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
@@ -17,7 +17,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/sarah_vaughan/sarah_vaughan.allofme
diff --git a/libstdc++-v3/testsuite/data/wostream_inserter_other-2.tst b/libstdc++-v3/testsuite/data/wostream_inserter_other-2.tst
index 57a6dab06ca..774f9bc546d 100644
--- a/libstdc++-v3/testsuite/data/wostream_inserter_other-2.tst
+++ b/libstdc++-v3/testsuite/data/wostream_inserter_other-2.tst
@@ -2,7 +2,7 @@
 // test functionality of basic_filebuf for char_type == char
 // this is a data file for 27filebuf.cc
 
-// Copyright (C) 1997-1999 Cygnus Solutions
+// Copyright (C) 1997-1999 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
@@ -17,7 +17,7 @@
 
 // You should have received a copy of the GNU General Public License along
 // with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
 /mnt/cdrom/sarah_vaughan/sarah_vaughan.allofme