PR libstdc++/7219 (continued)

2004-08-20  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/7219 (continued)
	* include/bits/ios_base.h (class ios_base): Expose Annex D.6
	typedefs by default.
	* testsuite/27_io/types/1.cc: Remove #if _GLIBCXX_DEPRECATED.
	* testsuite/27_io/ios_base/cons/assign_neg.cc: Tweak dg-error
	line number.
	* testsuite/27_io/ios_base/cons/copy_neg.cc: Likewise.

From-SVN: r86340

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 40b3a95dddfb7f5ccf6c7ac5f9dde738cb29a784..5c483c73c71df41823b3cb74170ae918e4e09292 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,7 +1,12 @@
-2004-08-20  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+2004-08-20  Paolo Carlini  <pcarlini@suse.de>
 
-       * cpu/hppa/atomicity.h (__exchange_and_add, __atomic_add): Add memory
-       barrier to locking asm.
+       PR libstdc++/7219 (continued)
+       * include/bits/ios_base.h (class ios_base): Expose Annex D.6
+       typedefs by default.
+       * testsuite/27_io/types/1.cc: Remove #if _GLIBCXX_DEPRECATED.
+       * testsuite/27_io/ios_base/cons/assign_neg.cc: Tweak dg-error
+       line number.
+       * testsuite/27_io/ios_base/cons/copy_neg.cc: Likewise.
 
 2004-08-20  Paolo Carlini  <pcarlini@suse.de>
 

diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h
index 694785df1f5533ff15766c6de167416b0231f290..eb97a49e426e134ccd0bf184bc8be7d0b511fc40 100644 (file)
--- a/libstdc++-v3/include/bits/ios_base.h
+++ b/libstdc++-v3/include/bits/ios_base.h
@@ -357,7 +357,6 @@ namespace std
     /// Request a seek relative to the current end of the sequence.
     static const seekdir end =         seekdir(SEEK_END);
 
-#ifdef _GLIBCXX_DEPRECATED
     // Annex D.6
     typedef int io_state;
     typedef int open_mode;
@@ -365,7 +364,6 @@ namespace std
 
     typedef std::streampos streampos;
     typedef std::streamoff streamoff;
-#endif
 
     // Callbacks;
     /**

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 626598e13a3b81babd9f6b261158b4e9beb5e2c1..ca3e3c97a4d481106d8da1cc06e4f6afd15738b7 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
@@ -41,5 +41,5 @@ void test01()
   io1 = io2;
 }
 // { dg-error "within this context" "" { target *-*-* } 41 } 
-// { dg-error "is private" "" { target *-*-* } 741 } 
+// { dg-error "is private" "" { target *-*-* } 739 } 
 // { 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 9df52f3997b6a3bbe5bc03b902929c7564d743e7..013138d874b141889f9ff6ed3fa15ebabe3d8065 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
@@ -41,5 +41,5 @@ void test02()
   test_base io2 = io1; 
 }
 // { dg-error "within this context" "" { target *-*-* } 41 } 
-// { dg-error "is private" "" { target *-*-* } 738 } 
+// { dg-error "is private" "" { target *-*-* } 736 } 
 // { dg-error "copy constructor" "" { target *-*-* } 0 } 

diff --git a/libstdc++-v3/testsuite/27_io/types/1.cc b/libstdc++-v3/testsuite/27_io/types/1.cc
index cfd5b9527ae7a6c0dae0c025947403450259ad9b..ce275a5d2094c09b49e4424825ff7fbaae209620 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/types/1.cc
+++ b/libstdc++-v3/testsuite/27_io/types/1.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2002 Free Software Foundation
+// Copyright (C) 2002, 2004 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
@@ -25,10 +25,8 @@
 // Annex D, deprecated.
 void test01()
 {
-#if _GLIBCXX_DEPRECATED
   std::ios_base::streampos spos;
   std::ios_base::streamoff soff;
-#endif
 }
 
 int main(void)