auto_ptr.cc (test07): Remove test that tries to copy-initialize an auto_ptr<Base...

        * testsuite/20_util/auto_ptr.cc (test07): Remove test that tries
        to copy-initialize an auto_ptr<Base> from an auto_ptr<Derived>; it
        isn't supposed to work anymore.

From-SVN: r38171

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 24427f60fedfb6e28f50f3772fb2a0346827793c..ffab0431575ca11d733515eb0b06cf94ec2daed9 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-09  Jason Merrill  <jason@redhat.com>
+
+       * testsuite/20_util/auto_ptr.cc (test07): Remove test that tries
+       to copy-initialize an auto_ptr<Base> from an auto_ptr<Derived>; it
+       isn't supposed to work anymore.
+
 2000-12-09  Phil Edwards  <pme@sources.redhat.com>
 
        Move the HTML-containing subdirs from 'docs' to 'docs/html'.

diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr.cc b/libstdc++-v3/testsuite/20_util/auto_ptr.cc
index a6aa338df1e94a11ff199de6e5471a77346de1b1..95d8fd0ee1cf9e91e50b7c8649a9fc5c1e1b7743 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/auto_ptr.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr.cc
@@ -261,12 +261,13 @@ test07()
   reset_count_struct reset;
 
   drain(source<A>());
-  drain<A>(source<B>());
+  // The resolution of core issue 84, now a DR, breaks this call.
+  // drain<A>(source<B>());
   drain(source<B>());
-  VERIFY( A::ctor_count == 3 );
-  VERIFY( A::dtor_count == 3 );
-  VERIFY( B::ctor_count == 2 );
-  VERIFY( B::dtor_count == 2 );
+  VERIFY( A::ctor_count == 2 );
+  VERIFY( A::dtor_count == 2 );
+  VERIFY( B::ctor_count == 1 );
+  VERIFY( B::dtor_count == 1 );
 
 #ifdef DEBUG_ASSERT
   assert(test);
@@ -288,4 +289,3 @@ main()
 
   return 0;
 }
-