2009-06-16 Jonathan Wakely <jwakely.gcc@gmail.com>

	* include/std/thread (~thread(), operator=(thread&&)): Call terminate
	if joinable.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148552 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2ca72ea..7d17880 100644 (file)
--- 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 (file)
--- 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;
     }