From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 28 Sep 2015 18:44:40 +0000 (+0000)
Subject: LWG 2135: terminate() in condition_variable::wait()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba2936df417a617f5f07c2bfc3c4c798f16705e7;p=thirdparty%2Fgcc.git

LWG 2135: terminate() in condition_variable::wait()

	* include/std/condition_variable (condition_variable::wait): Add
	noexcept.
	* src/c++11/condition_variable.cc (condition_variable::wait): Call
	std::terminate on error (DR 2135).

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 50f6e8b694c6..6b2738f3aed9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-28  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/std/condition_variable (condition_variable::wait): Add
+	noexcept.
+	* src/c++11/condition_variable.cc (condition_variable::wait): Call
+	std::terminate on error (DR 2135).
+
 2015-09-25  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
 	Avoid creating dangling references in case of nested tuples
diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable
index 4714774f1c3d..f5f773492ade 100644
--- a/libstdc++-v3/include/std/condition_variable
+++ b/libstdc++-v3/include/std/condition_variable
@@ -89,7 +89,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     notify_all() noexcept;
 
     void
-    wait(unique_lock<mutex>& __lock);
+    wait(unique_lock<mutex>& __lock) noexcept;
 
     template<typename _Predicate>
       void
diff --git a/libstdc++-v3/src/c++11/condition_variable.cc b/libstdc++-v3/src/c++11/condition_variable.cc
index cc0f6e4506a0..fd850cb52119 100644
--- a/libstdc++-v3/src/c++11/condition_variable.cc
+++ b/libstdc++-v3/src/c++11/condition_variable.cc
@@ -48,12 +48,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   }
 
   void
-  condition_variable::wait(unique_lock<mutex>& __lock)
+  condition_variable::wait(unique_lock<mutex>& __lock) noexcept
   {
     int __e = __gthread_cond_wait(&_M_cond, __lock.mutex()->native_handle());
 
     if (__e)
-      __throw_system_error(__e);
+      std::terminate();
   }
 
   void