summaryrefslogtreecommitdiff
path: root/libstdc++-v3/testsuite/tr1
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2006-08-27 15:19:23 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2006-08-27 15:19:23 +0000
commitea0cad828f9a1c0ef71f52653424452327aca20f (patch)
treeb51fe68403785bcf6bfc22ea3eb8205f0b8824f1 /libstdc++-v3/testsuite/tr1
parent1078d25d3b169afcbb9c69ee68ee3df3be80fc94 (diff)
downloadgcc-ea0cad828f9a1c0ef71f52653424452327aca20f.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116489 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite/tr1')
-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.cc5
2 files changed, 4 insertions, 12 deletions
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 de749004203..5b17500165f 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 38fed913690..370218a1136 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>