From 80efc5073d4f76471cc7fdc41e2a33a213a86baf Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 3 Jan 2017 13:31:26 +0000
Subject: [PATCH] Add deleted std::thread(const thread&&) constructor
PR libstdc++/78956
* include/std/thread (thread(const thread&&)): Add deleted
constructor.
* testsuite/30_threads/thread/cons/lwg2097.cc: New test.
From-SVN: r244022
---
libstdc++-v3/ChangeLog | 5 ++++
libstdc++-v3/include/std/thread | 1 +
.../30_threads/thread/cons/lwg2097.cc | 29 +++++++++++++++++++
3 files changed, 35 insertions(+)
create mode 100644 libstdc++-v3/testsuite/30_threads/thread/cons/lwg2097.cc
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a1b1667812a0..2106d3771051 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2017-01-03 Jonathan Wakely <jwakely@redhat.com>
+ PR libstdc++/78956
+ * include/std/thread (thread(const thread&&)): Add deleted
+ constructor.
+ * testsuite/30_threads/thread/cons/lwg2097.cc: New test.
+
* doc/xml/manual/spine.xml: Update copyright years.
* doc/xml/manual/build_hacking.xml: Fix spelling of libbuilddir.
* doc/xml/manual/test.xml: Likewise.
diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread
index f725bdb70423..8e2cb68e2954 100644
--- a/libstdc++-v3/include/std/thread
+++ b/libstdc++-v3/include/std/thread
@@ -108,6 +108,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// 2097. packaged_task constructors should be constrained
thread(thread&) = delete;
thread(const thread&) = delete;
+ thread(const thread&&) = delete;
thread(thread&& __t) noexcept
{ swap(__t); }
diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/lwg2097.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/lwg2097.cc
new file mode 100644
index 000000000000..165c6496b6e0
--- /dev/null
+++ b/libstdc++-v3/testsuite/30_threads/thread/cons/lwg2097.cc
@@ -0,0 +1,29 @@
+// { dg-do compile { target c++11 } }
+// { dg-require-cstdint "" }
+// { dg-require-gthreads "" }
+
+// Copyright (C) 2017 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <thread>
+
+using std::thread;
+using std::is_constructible;
+
+static_assert( !is_constructible<thread, thread&>::value, "" );
+static_assert( !is_constructible<thread, const thread&>::value, "" );
+static_assert( !is_constructible<thread, const thread>::value, "" );
--
GitLab