From 0370f61a541ef2c41fafb788facd2b1de67c317c Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sun, 27 Aug 2006 15:19:23 +0000 Subject: [PATCH] re PR libstdc++/28830 (FAIL: tr1/2_general_utilities/memory/shared_ptr/thread/lockfree_weaktoshared.cc) 2006-08-27 Paolo Carlini PR libstdc++/28830 * testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/ lockfree_weaktoshared.cc: Rename to... * testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/ default_weaktoshared.cc: ... this; test the default base class. * testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/ mutex_weaktoshared.cc: Run like the other thread tests. From-SVN: r116489 --- libstdc++-v3/ChangeLog | 10 ++++++++++ .../{lockfree_weaktoshared.cc => default_weaktoshared.cc} | 11 +++-------- .../memory/shared_ptr/thread/mutex_weaktoshared.cc | 5 +---- 3 files changed, 14 insertions(+), 12 deletions(-) rename libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/{lockfree_weaktoshared.cc => default_weaktoshared.cc} (89%) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b204210..843e5fc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2006-08-27 Paolo Carlini + + PR libstdc++/28830 + * testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/ + lockfree_weaktoshared.cc: Rename to... + * testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/ + default_weaktoshared.cc: ... this; test the default base class. + * testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/ + mutex_weaktoshared.cc: Run like the other thread tests. + 2006-08-25 Paolo Carlini * docs/html/ext/tr1.html: Update. diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/lockfree_weaktoshared.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/default_weaktoshared.cc similarity index 89% rename from libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/lockfree_weaktoshared.cc rename to libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/default_weaktoshared.cc index de74900..5b17500 100644 --- a/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/lockfree_weaktoshared.cc +++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/default_weaktoshared.cc @@ -19,12 +19,9 @@ // TR1 2.2.2 Template class shared_ptr [tr.util.smartptr.shared] // { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } } -// { dg-options "-march=i586 -pthread" { target { {*-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf*} && { *i686*-*-* *i586*-*-* *athlon*-*-* *pentium4*-*-* *opteron*-*-* *k8*-*-* } } } } -// { dg-options "-pthread" { target { {*-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf*} && { ! { *i686*-*-* *i586*-*-* *athlon*-*-* *pentium4*-*-* *opteron*-*-* *k8*-*-* } } } } } +// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* } } // { dg-options "-pthreads" { target *-*-solaris* } } -// Lock-free compare-and-swap is only available on newer x86 machines. - #include #include #include @@ -66,10 +63,8 @@ struct A _Atomic_word A::counter = 0; -using std::tr1::_S_lockfree; - -typedef std::tr1::__shared_ptr sp_A_t; -typedef std::tr1::__weak_ptr wp_A_t; +typedef std::tr1::shared_ptr sp_A_t; +typedef std::tr1::weak_ptr wp_A_t; typedef std::vector sp_vector_t; typedef std::vector wp_vector_t; diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/mutex_weaktoshared.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/mutex_weaktoshared.cc index 38fed91..370218a 100644 --- a/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/mutex_weaktoshared.cc +++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/mutex_weaktoshared.cc @@ -19,12 +19,9 @@ // TR1 2.2.2 Template class shared_ptr [tr.util.smartptr.shared] // { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } } -// { dg-options "-march=i586 -pthread" { target { {*-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf*} && { *i686*-*-* *i586*-*-* *athlon*-*-* *pentium4*-*-* *opteron*-*-* *k8*-*-* } } } } -// { dg-options "-pthread" { target { {*-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf*} && { ! { *i686*-*-* *i586*-*-* *athlon*-*-* *pentium4*-*-* *opteron*-*-* *k8*-*-* } } } } } +// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* } } // { dg-options "-pthreads" { target *-*-solaris* } } -// Lock-free compare-and-swap is only available on newer x86 machines. - #include #include #include -- 2.7.4