diff options
author | Jason Merrill <jason@redhat.com> | 2010-08-06 15:41:23 -0400 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 2010-08-06 15:41:23 -0400 |
commit | b2edc921474d996f69cfd1c937afea8ef339987e (patch) | |
tree | f0b1d58035f0ca04dafa010bebee3120365ca699 | |
parent | 309714d4388913de9f47100d4fc77c028aee807d (diff) | |
download | gcc-b2edc921474d996f69cfd1c937afea8ef339987e.zip gcc-b2edc921474d996f69cfd1c937afea8ef339987e.tar.gz gcc-b2edc921474d996f69cfd1c937afea8ef339987e.tar.bz2 |
* include/std/thread: Add deleted thread(thread&).
From-SVN: r162954
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | libstdc++-v3/include/std/thread | 1 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9690a7e..ccdf13a9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2010-08-06 Jason Merrill <jason@redhat.com> + + * include/std/thread: Add deleted thread(thread&). + * testsuite/30_threads/thread/cons/copy_neg.cc: Remove XFAIL. + 2010-08-06 Paolo Carlini <paolo.carlini@oracle.com> * include/std/tuple (pack_arguments): Rename to forward_as_tuple diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread index c348c76..8007edc 100644 --- a/libstdc++-v3/include/std/thread +++ b/libstdc++-v3/include/std/thread @@ -123,6 +123,7 @@ namespace std public: thread() = default; + thread(thread&) = delete; thread(const thread&) = delete; thread(thread&& __t) diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc index db06e72..9d8681d 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc @@ -27,13 +27,7 @@ void test01() // copy typedef std::thread test_type; test_type t1; - test_type t2(t1); // { dg-error "deleted" "" { xfail *-*-* } } + test_type t2(t1); // { dg-error "deleted" } } -// This is failing for the wrong reason; it should fail because we're -// trying to call the deleted copy constructor, but instead it fails -// because we try to call the thread(_Callable&&,_Args&&...) constructor -// and fail because thread isn't callable. But that's OK for now. -// { dg-error "" "" { target *-*-* } 30 } - // { dg-prune-output "include" } |