numeric_limits.cc: Add _GLIBCXX_ASSERT to dg-options in testcases that use VERIFY.

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.

From-SVN: r74951

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 06deeb102de9c14cb24acd0568e1fad340c6fe69..832d5a021cbfdfc8637fdf1485299abea22351a0 100644 (file)
--- 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 3415ff1ed50a2cf76d33b6565e8bd336d31f9bc7..fee64fcbdb0ea8262c1c6b4e6f209224bb49ba3c 100644 (file)
--- 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 a96cdf55453fda478f00d9aaf01f192cec036787..a7c2494a8b9e6bdd8dd36e7fb0574b3b0fdc40f4 100644 (file)
--- 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 ccbcb159046b5343a7ebe9dbd7bdab8920a656dd..833ec544d4b3acc9bb4d6e8acfa292c4fd322814 100644 (file)
--- 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 1f59639183206ef874324fa18265db27d27aa961..6526504c30d83b8aae8360e683687678513fc4b6 100644 (file)
--- 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 656dd61f71559a301fd580f32f1b3a85da609934..b34af6448ff401dfb027d35ffac6c8abee9946fc 100644 (file)
--- 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 1492d9c0cecd66d4edd68a4f9010d5854a230a9e..0a9628ff4ed2a66d5bac0120d6befce49788ef9e 100644 (file)
--- 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 5f8a9de547fae88f54d5b94ceb339471a3d3d4bb..c8e07cd54c7ced5d00c328389466037eb3aa51ce 100644 (file)
--- 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 62720c621f3dc045eb70dd2db5eb39ebc4b92369..edb8f33c5449a1e640ca82037e63e7e9ec494f36 100644 (file)
--- 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 ce5303111acf8d471361609ef87a941f49d792c5..07b9bbe79fb4de0acdd0f7b2c9142e9439d92a55 100644 (file)
--- 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 960669e4804e1be9dc43d370752f953f2e28c9c3..65ed829e193a0f03fc739759a17e1b0d1442106d 100644 (file)
--- 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 ea5e13a422a8394ef8cf2a5840ea952d25b57882..3a5d7025ce70c877bdea0c04de42743843cc53b2 100644 (file)
--- 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 be6c22deb05d4250b2e4dea13cef8fb37882d0db..6d07434851a55278f9b34a32e51949c323c5cf5c 100644 (file)
--- 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 087ba0f529ab7db1d937e3679122c732eafbd097..a0139e98d8913c94ffc32737c73b8a1c3d3c5dbb 100644 (file)
--- 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 906201c8967a7b0726cf234abe18685f3d5db350..9ce059d297d2b843066db69db53f0c66759a9321 100644 (file)
--- 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;