diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 10 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/default_weaktoshared.cc (renamed from libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/lockfree_weaktoshared.cc) | 11 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/tr1/2_general_utilities/memory/shared_ptr/thread/mutex_weaktoshared.cc | 5 |
3 files changed, 14 insertions, 12 deletions
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 <pcarlini@suse.de> + + 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 <pcarlini@suse.de> * 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 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 <tr1/memory> #include <tr1/random> #include <vector> @@ -66,10 +63,8 @@ struct A _Atomic_word A::counter = 0; -using std::tr1::_S_lockfree; - -typedef std::tr1::__shared_ptr<A, _S_lockfree> sp_A_t; -typedef std::tr1::__weak_ptr<A, _S_lockfree> wp_A_t; +typedef std::tr1::shared_ptr<A> sp_A_t; +typedef std::tr1::weak_ptr<A> wp_A_t; typedef std::vector<sp_A_t> sp_vector_t; typedef std::vector<wp_A_t> 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 <tr1/memory> #include <tr1/random> #include <vector> |