diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 12 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/requirements/base_classes.cc | 12 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc | 11 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc | 11 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/ext/codecvt/char-1.cc | 13 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/ext/codecvt/char-2.cc | 13 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc | 39 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc | 5 |
8 files changed, 77 insertions, 39 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index aee8b04f962..1e35102b201 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2011-10-06 Paolo Carlini <paolo.carlini@oracle.com> + + * testsuite/27_io/ios_base/cons/assign_neg.cc: Tidy dg- directives, + for C++0x testing too. + * testsuite/27_io/ios_base/cons/copy_neg.cc: Likewise. + * testsuite/ext/pb_ds/example/hash_resize_neg.cc: Likewise. + * testsuite/24_iterators/istreambuf_iterator/requirements/ + base_classes.cc: Adjust for C++0x testing. + * testsuite/ext/codecvt/char-1.cc: Avoid warnings in C++0x mode. + * testsuite/ext/codecvt/char-2.cc: Likewise. + * testsuite/ext/codecvt/wchar_t.cc: Likewise. + 2011-10-05 Paolo Carlini <paolo.carlini@oracle.com> * include/ext/pod_char_traits.h: Avoid warnings in C++0x mode diff --git a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/requirements/base_classes.cc b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/requirements/base_classes.cc index 5c7274579e0..ce946f6a419 100644 --- a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/requirements/base_classes.cc +++ b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/requirements/base_classes.cc @@ -1,7 +1,8 @@ // { dg-do compile } // 1999-06-28 bkoz -// Copyright (C) 1999, 2001, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 1999, 2001, 2003, 2009, 2010, 2011 +// 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 @@ -31,7 +32,14 @@ void test01() // Check for required base class. typedef istreambuf_iterator<char> test_iterator; typedef char_traits<char>::off_type off_type; - typedef iterator<input_iterator_tag, char, off_type, char*, char&> base_iterator; + + typedef iterator<input_iterator_tag, char, off_type, char*, +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + char> +#else + char&> +#endif + base_iterator; istringstream isstream("this tag"); test_iterator r_it(isstream); 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 4bbe5b11925..488e393d2a7 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 @@ -18,21 +18,18 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. - #include <ios> // Library defect report //50. Copy constructor and assignment operator of ios_base -class test_base : public std::ios_base { }; +class test_base : public std::ios_base { }; // { dg-error "within this context|deleted" } void test01() { // assign test_base io1; test_base io2; - io1 = io2; + io1 = io2; // { dg-error "synthesized|deleted" } } -// { dg-error "synthesized" "" { target *-*-* } 33 } -// { dg-error "within this context" "" { target *-*-* } 26 } -// { dg-error "is private" "" { target *-*-* } 791 } -// { dg-error "operator=" "" { target *-*-* } 0 } + +// { dg-prune-output "include" } 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 6f453736e87..22caadc6497 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 @@ -18,21 +18,18 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. - #include <ios> // Library defect report //50. Copy constructor and assignment operator of ios_base -struct test_base : public std::ios_base +struct test_base : public std::ios_base // { dg-error "within this context|deleted" } { }; void test02() { // copy ctor test_base io1; - test_base io2 = io1; + test_base io2 = io1; // { dg-error "synthesized|deleted" } } -// { dg-error "within this context" "" { target *-*-* } 26 } -// { dg-error "synthesized" "" { target *-*-* } 33 } -// { dg-error "is private" "" { target *-*-* } 788 } -// { dg-error "copy constructor" "" { target *-*-* } 0 } + +// { dg-prune-output "include" } diff --git a/libstdc++-v3/testsuite/ext/codecvt/char-1.cc b/libstdc++-v3/testsuite/ext/codecvt/char-1.cc index 733dff8a078..8e0d56f55a4 100644 --- a/libstdc++-v3/testsuite/ext/codecvt/char-1.cc +++ b/libstdc++-v3/testsuite/ext/codecvt/char-1.cc @@ -4,6 +4,7 @@ // 2000-08-22 Benjamin Kosnik <bkoz@cygnus.com> // Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// 2010, 2011 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -69,10 +70,14 @@ void test01() char i_lit_base[50] __attribute__((aligned(__alignof__(int_type)))) = { - 0x00, 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0 + char(0x00), char(0x62), char(0x00), char(0x6c), char(0x00), char(0x61), + char(0x00), char(0x63), char(0x00), char(0x6b), char(0x00), char(0x20), + char(0x00), char(0x70), char(0x00), char(0x65), char(0x00), char(0x61), + char(0x00), char(0x72), char(0x00), char(0x6c), char(0x00), char(0x20), + char(0x00), char(0x6a), char(0x00), char(0x61), char(0x00), char(0x73), + char(0x00), char(0x6d), char(0x00), char(0x69), char(0x00), char(0x6e), + char(0x00), char(0x65), char(0x00), char(0x20), char(0x00), char(0x74), + char(0x00), char(0x65), char(0x00), char(0x61), char(0x00), char(0xa0) }; const int_type* i_lit = reinterpret_cast<int_type*>(i_lit_base); diff --git a/libstdc++-v3/testsuite/ext/codecvt/char-2.cc b/libstdc++-v3/testsuite/ext/codecvt/char-2.cc index b6bfde01e8a..81c42e25f06 100644 --- a/libstdc++-v3/testsuite/ext/codecvt/char-2.cc +++ b/libstdc++-v3/testsuite/ext/codecvt/char-2.cc @@ -4,6 +4,7 @@ // 2000-08-22 Benjamin Kosnik <bkoz@cygnus.com> // Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// 2010, 2011 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -69,10 +70,14 @@ void test02() char i_lit_base[50] __attribute__((aligned(__alignof__(int_type)))) = { - 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, 0x00, - 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, 0x00, - 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, 0x00, - 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0, 0x00 + char(0x62), char(0x00), char(0x6c), char(0x00), char(0x61), char(0x00), + char(0x63), char(0x00), char(0x6b), char(0x00), char(0x20), char(0x00), + char(0x70), char(0x00), char(0x65), char(0x00), char(0x61), char(0x00), + char(0x72), char(0x00), char(0x6c), char(0x00), char(0x20), char(0x00), + char(0x6a), char(0x00), char(0x61), char(0x00), char(0x73), char(0x00), + char(0x6d), char(0x00), char(0x69), char(0x00), char(0x6e), char(0x00), + char(0x65), char(0x00), char(0x20), char(0x00), char(0x74), char(0x00), + char(0x65), char(0x00), char(0x61), char(0x00), char(0xa0), char(0x00) }; const int_type* i_lit = reinterpret_cast<int_type*>(i_lit_base); diff --git a/libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc b/libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc index 4040f876b1b..ae8e47be127 100644 --- a/libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc +++ b/libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc @@ -3,7 +3,8 @@ // 2000-08-23 Benjamin Kosnik <bkoz@cygnus.com> -// Copyright (C) 2000, 2001, 2002, 2003, 2007, 2009 Free Software Foundation +// Copyright (C) 2000, 2001, 2002, 2003, 2007, 2009, 2010, 2011 +// 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 @@ -43,23 +44,35 @@ void test01() int size = 23; char e_lit_base[96] __attribute__((aligned(__alignof__(ext_type)))) = { - 0x00, 0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x61, - 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x20, - 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x61, - 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x20, - 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0x73, - 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x6e, - 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0xa0 + char(0x00), char(0x00), char(0x00), char(0x62), char(0x00), char(0x00), + char(0x00), char(0x6c), char(0x00), char(0x00), char(0x00), char(0x61), + char(0x00), char(0x00), char(0x00), char(0x63), char(0x00), char(0x00), + char(0x00), char(0x6b), char(0x00), char(0x00), char(0x00), char(0x20), + char(0x00), char(0x00), char(0x00), char(0x70), char(0x00), char(0x00), + char(0x00), char(0x65), char(0x00), char(0x00), char(0x00), char(0x61), + char(0x00), char(0x00), char(0x00), char(0x72), char(0x00), char(0x00), + char(0x00), char(0x6c), char(0x00), char(0x00), char(0x00), char(0x20), + char(0x00), char(0x00), char(0x00), char(0x6a), char(0x00), char(0x00), + char(0x00), char(0x61), char(0x00), char(0x00), char(0x00), char(0x73), + char(0x00), char(0x00), char(0x00), char(0x6d), char(0x00), char(0x00), + char(0x00), char(0x69), char(0x00), char(0x00), char(0x00), char(0x6e), + char(0x00), char(0x00), char(0x00), char(0x65), char(0x00), char(0x00), + char(0x00), char(0x20), char(0x00), char(0x00), char(0x00), char(0x74), + char(0x00), char(0x00), char(0x00), char(0x65), char(0x00), char(0x00), + char(0x00), char(0x61), char(0x00), char(0x00), char(0x00), char(0xa0) }; const ext_type* e_lit = reinterpret_cast<ext_type*>(e_lit_base); char i_lit_base[48] __attribute__((aligned(__alignof__(int_type)))) = { - 0x00, 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0 + char(0x00), char(0x62), char(0x00), char(0x6c), char(0x00), char(0x61), + char(0x00), char(0x63), char(0x00), char(0x6b), char(0x00), char(0x20), + char(0x00), char(0x70), char(0x00), char(0x65), char(0x00), char(0x61), + char(0x00), char(0x72), char(0x00), char(0x6c), char(0x00), char(0x20), + char(0x00), char(0x6a), char(0x00), char(0x61), char(0x00), char(0x73), + char(0x00), char(0x6d), char(0x00), char(0x69), char(0x00), char(0x6e), + char(0x00), char(0x65), char(0x00), char(0x20), char(0x00), char(0x74), + char(0x00), char(0x65), char(0x00), char(0x61), char(0x00), char(0xa0) }; const int_type* i_lit = reinterpret_cast<int_type*>(i_lit_base); diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc index c5b2bd2e98f..e4c922af4f2 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc @@ -1,7 +1,8 @@ // { dg-do compile } // -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 +// 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 terms @@ -60,4 +61,4 @@ int main() h.resize(20); // { dg-error "required from" } } -// { dg-error "invalid" "" { target *-*-* } 187 } +// { dg-prune-output "include" } |