diff options
15 files changed, 34 insertions, 17 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 06deeb1..832d5a0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,24 @@ 2003-12-22 Benjamin Kosnik <bkoz@redhat.com> + * testsuite/18_support/numeric_limits.cc: Add _GLIBCXX_ASSERT to + dg-options in testcases that use VERIFY. + * testsuite/23_containers/vector/invalidation/1.cc: Same. + * testsuite/23_containers/vector/invalidation/2.cc: Same. + * testsuite/23_containers/vector/invalidation/3.cc: Same. + * testsuite/23_containers/vector/invalidation/4.cc: Same. + * testsuite/23_containers/vector/resize/1.cc: Same. + * testsuite/26_numerics/complex_value.cc: Same. + * testsuite/27_io/ios_base/storage/1.cc: Same. + * testsuite/27_io/ios_base/storage/2.cc: Same. + * testsuite/27_io/ios_base/storage/3.cc: Same. + * testsuite/27_io/manipulators/standard/char/2.cc: Same. + * testsuite/backward/11460.cc: Same. + * testsuite/backward/strstream_members.cc: Same. + + * include/ext/hash_set (class hash_multiset): Fix typo. + +2003-12-22 Benjamin Kosnik <bkoz@redhat.com> + * testsuite/27_io/objects/char/5.cc: Don't use stdc++.h.gch. * testsuite/27_io/objects/wchar_t/5.cc: Same. * docs/html/test.html: Add docs for constructing test files that diff --git a/libstdc++-v3/include/ext/hash_set b/libstdc++-v3/include/ext/hash_set index 3415ff1..fee64fc 100644 --- a/libstdc++-v3/include/ext/hash_set +++ b/libstdc++-v3/include/ext/hash_set @@ -267,7 +267,7 @@ public: typedef typename _Ht::size_type size_type; typedef typename _Ht::difference_type difference_type; typedef typename _Alloc::pointer pointer; - typedef typename _Alloc:const_pointer const_pointer; + typedef typename _Alloc::const_pointer const_pointer; typedef typename _Alloc::reference reference; typedef typename _Alloc::const_reference const_reference; diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits.cc b/libstdc++-v3/testsuite/18_support/numeric_limits.cc index a96cdf5..a7c2494 100644 --- a/libstdc++-v3/testsuite/18_support/numeric_limits.cc +++ b/libstdc++-v3/testsuite/18_support/numeric_limits.cc @@ -1,4 +1,4 @@ -// { dg-options "-mieee" { target alpha*-*-* } } +// { dg-options "-D_GLIBCXX_ASSERT -mieee" { target alpha*-*-* } } // 1999-08-23 bkoz diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc index ccbcb15..833ec54 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc @@ -19,7 +19,7 @@ // USA. // We need to be pedantic about reallocations for this testcase to be correct. -// { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" } +// { dg-options "-D_GLIBCXX_ASSERT -D_GLIBCXX_DEBUG_PEDANTIC" } #ifndef _GLIBCXX_DEBUG_PEDANTIC # define _GLIBCXX_DEBUG_PEDANTIC 1 diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc index 1f59639..6526504 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc @@ -19,7 +19,7 @@ // USA. // We need to be pedantic about reallocations for this testcase to be correct. -// { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" } +// { dg-options "-D_GLIBCXX_ASSERT -D_GLIBCXX_DEBUG_PEDANTIC" } #ifndef _GLIBCXX_DEBUG_PEDANTIC # define _GLIBCXX_DEBUG_PEDANTIC 1 diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc index 656dd61..b34af64 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc @@ -19,7 +19,7 @@ // USA. // We need to be pedantic about reallocations for this testcase to be correct. -// { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" } +// { dg-options "-D_GLIBCXX_ASSERT -D_GLIBCXX_DEBUG_PEDANTIC" } #ifndef _GLIBCXX_DEBUG_PEDANTIC # define _GLIBCXX_DEBUG_PEDANTIC 1 diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc index 1492d9c..0a9628f 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc @@ -19,7 +19,7 @@ // USA. // We need to be pedantic about reallocations for this testcase to be correct. -// { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" } +// { dg-options "-D_GLIBCXX_ASSERT -D_GLIBCXX_DEBUG_PEDANTIC" } #ifndef _GLIBCXX_DEBUG_PEDANTIC # define _GLIBCXX_DEBUG_PEDANTIC 1 diff --git a/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc b/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc index 5f8a9de..c8e07cd 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc @@ -24,7 +24,7 @@ // XXX This test will not work for irix6 because of bug(s) in libc malloc // XXX for very large allocations. However -lmalloc seems to work. // See http://gcc.gnu.org/ml/libstdc++/2002-12/msg00131.html -// { dg-options "-lmalloc" { target mips*-*-irix6* } } +// { dg-options "-D_GLIBCXX_ASSERT -lmalloc" { target mips*-*-irix6* } } #include <vector> #include <stdexcept> diff --git a/libstdc++-v3/testsuite/26_numerics/complex_value.cc b/libstdc++-v3/testsuite/26_numerics/complex_value.cc index 62720c6..edb8f33 100644 --- a/libstdc++-v3/testsuite/26_numerics/complex_value.cc +++ b/libstdc++-v3/testsuite/26_numerics/complex_value.cc @@ -1,4 +1,4 @@ -// { dg-options "-O0" } +// { dg-options "-D_GLIBCXX_ASSERT -O0" } // 2000-11-20 // Benjamin Kosnik bkoz@redhat.com diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc index ce53031..07b9bbe 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc @@ -24,7 +24,7 @@ // XXX bug(s) in libc malloc for very large allocations. However // XXX -lmalloc seems to work. // See http://gcc.gnu.org/ml/gcc/2002-05/msg01012.html -// { dg-options "-lmalloc" { target mips*-*-irix6* } } +// { dg-options "-D_GLIBCXX_ASSERT -lmalloc" { target mips*-*-irix6* } } #include <sstream> #include <iostream> diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc index 960669e..65ed829 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc @@ -24,7 +24,7 @@ // XXX bug(s) in libc malloc for very large allocations. However // XXX -lmalloc seems to work. // See http://gcc.gnu.org/ml/gcc/2002-05/msg01012.html -// { dg-options "-lmalloc" { target mips*-*-irix6* } } +// { dg-options "-D_GLIBCXX_ASSERT -lmalloc" { target mips*-*-irix6* } } #include <sstream> #include <iostream> diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc index ea5e13a..3a5d702 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc @@ -24,7 +24,7 @@ // XXX bug(s) in libc malloc for very large allocations. However // XXX -lmalloc seems to work. // See http://gcc.gnu.org/ml/gcc/2002-05/msg01012.html -// { dg-options "-lmalloc" { target mips*-*-irix6* } } +// { dg-options "-D_GLIBCXX_ASSERT -lmalloc" { target mips*-*-irix6* } } #include <sstream> #include <iostream> diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc index be6c22d..6d07434 100644 --- a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc @@ -1,3 +1,5 @@ +// { dg-options "-D_GLIBCXX_ASSERT -fno-implicit-templates" } + // Copyright (C) 2001, 2002 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -20,8 +22,6 @@ // their own code with -fno-implicit-templates and not suffer from a zillion // link errors. -// { dg-options "-fno-implicit-templates" } - #include <fstream> #include <istream> #include <ostream> diff --git a/libstdc++-v3/testsuite/backward/11460.cc b/libstdc++-v3/testsuite/backward/11460.cc index 087ba0f..a0139e9 100644 --- a/libstdc++-v3/testsuite/backward/11460.cc +++ b/libstdc++-v3/testsuite/backward/11460.cc @@ -1,3 +1,4 @@ +// { dg-options "-Wno-deprecated -D_GLIBCXX_ASSERT" } // Copyright (C) 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -19,8 +20,6 @@ #include <strstream> #include <testsuite_hooks.h> -// { dg-options "-Wno-deprecated" } - class Buf : public std::strstreambuf { public: diff --git a/libstdc++-v3/testsuite/backward/strstream_members.cc b/libstdc++-v3/testsuite/backward/strstream_members.cc index 906201c..9ce059d 100644 --- a/libstdc++-v3/testsuite/backward/strstream_members.cc +++ b/libstdc++-v3/testsuite/backward/strstream_members.cc @@ -1,3 +1,4 @@ +// { dg-options "-Wno-deprecated" } // Copyright (C) 2002 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -21,8 +22,6 @@ #include <strstream> #include <testsuite_hooks.h> -// { dg-options "-Wno-deprecated" } - void test01() { std::strstream s; |