From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 20 Sep 2017 13:25:07 +0000 (+0100)
Subject: Remove non-standard std::copy_exception function
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=20f661fbd2fce6c486bb8b0b5ff1161330c38e7d;p=gcc.git

Remove non-standard std::copy_exception function

	* libsupc++/exception_ptr.h (copy_exception): Remove deprecated
	non-standard function.

From-SVN: r253011
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6c92731ae6a..5a2c960bd86 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2017-09-20  Jonathan Wakely  <jwakely@redhat.com>
 
+	* libsupc++/exception_ptr.h (copy_exception): Remove deprecated
+	non-standard function.
+
 	PR libstdc++/82262
 	* include/std/optional (__optional_hash_call_base): Add template
 	parameter for remove_const_t<_Tp> and use it consistently.
diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h
index 0ece81d8137..dae4ca68fcf 100644
--- a/libstdc++-v3/libsupc++/exception_ptr.h
+++ b/libstdc++-v3/libsupc++/exception_ptr.h
@@ -201,19 +201,6 @@ namespace std
 #endif
     }
 
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 1130. copy_exception name misleading
-  /// Obtain an exception_ptr pointing to a copy of the supplied object.
-  /// This function is deprecated, use std::make_exception_ptr instead.
-  template<typename _Ex>
-    exception_ptr
-    copy_exception(_Ex __ex) _GLIBCXX_USE_NOEXCEPT _GLIBCXX_DEPRECATED;
-
-  template<typename _Ex>
-    exception_ptr
-    copy_exception(_Ex __ex) _GLIBCXX_USE_NOEXCEPT
-    { return std::make_exception_ptr<_Ex>(__ex); }
-
   // @} group exceptions
 } // namespace std