aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2009-06-16 20:34:43 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2009-06-16 21:34:43 +0100
commitcd3b0fafaaebab56b17ec9f4fceff4c0f8e26aec (patch)
tree196344e8f3b4080471599909e1272d5dcbb810a6 /libstdc++-v3
parent504b33d80c765882499196e44cce9656a6517e81 (diff)
downloadgcc-cd3b0fafaaebab56b17ec9f4fceff4c0f8e26aec.zip
gcc-cd3b0fafaaebab56b17ec9f4fceff4c0f8e26aec.tar.gz
gcc-cd3b0fafaaebab56b17ec9f4fceff4c0f8e26aec.tar.bz2
thread (~thread(), [...]): Call terminate if joinable.
2009-06-16 Jonathan Wakely <jwakely.gcc@gmail.com> * include/std/thread (~thread(), operator=(thread&&)): Call terminate if joinable. From-SVN: r148552
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/std/thread4
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2ca72ea..7d17880 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-16 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * include/std/thread (~thread(), operator=(thread&&)): Call terminate
+ if joinable.
+
2009-06-15 Tom Tromey <tromey@redhat.com>
* python/libstdcxx/v6/printers.py (StdMapPrinter.__init__): Don't
diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread
index fbdfe2e..bf282cc 100644
--- a/libstdc++-v3/include/std/thread
+++ b/libstdc++-v3/include/std/thread
@@ -135,7 +135,7 @@ namespace std
~thread()
{
if (joinable())
- detach();
+ std::terminate();
}
thread& operator=(const thread&) = delete;
@@ -143,7 +143,7 @@ namespace std
thread& operator=(thread&& __t)
{
if (joinable())
- detach();
+ std::terminate();
swap(__t);
return *this;
}