diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2004-08-20 21:14:56 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2004-08-20 21:14:56 +0000 |
| commit | 00218cb56ad3ce3f702dd4f565132d3e278e560a (patch) | |
| tree | e8a8727ef30141e92b2efc6325d9563a33660c79 | |
| parent | f3b2657c01366bc9ea847b95745c4f89cdc5661c (diff) | |
| download | gcc-00218cb56ad3ce3f702dd4f565132d3e278e560a.zip gcc-00218cb56ad3ce3f702dd4f565132d3e278e560a.tar.gz gcc-00218cb56ad3ce3f702dd4f565132d3e278e560a.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 11 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/ios_base.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/27_io/types/1.cc | 4 |
5 files changed, 11 insertions, 10 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 40b3a95..5c483c7 100644 --- 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 694785d..eb97a49 100644 --- 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 626598e..ca3e3c9 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 @@ -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 9df52f3..013138d 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 @@ -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 cfd5b95..ce275a5 100644 --- 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) |