aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2000-12-10 06:23:50 -0500
committerJason Merrill <jason@gcc.gnu.org>2000-12-10 06:23:50 -0500
commit913ac9fa8e7fac9efedf54512ea11ad5f9cb2113 (patch)
tree4d2275bfb2b5003ebc3596113f7fabcc8d8b29d0
parent3d4eaaf3be861796b8fc424859d0d509bd174603 (diff)
downloadgcc-913ac9fa8e7fac9efedf54512ea11ad5f9cb2113.zip
gcc-913ac9fa8e7fac9efedf54512ea11ad5f9cb2113.tar.gz
gcc-913ac9fa8e7fac9efedf54512ea11ad5f9cb2113.tar.bz2
auto_ptr.cc (test07): Remove test that tries to copy-initialize an auto_ptr<Base> from an...
* 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
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/testsuite/20_util/auto_ptr.cc12
2 files changed, 12 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 24427f6..ffab043 100644
--- 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 a6aa338..95d8fd0 100644
--- 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;
}
-