From c86996727f9c4ea4e2aed092d631a2cf99110c5d Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 26 Jan 2017 19:40:02 +0000
Subject: [PATCH] PR libstdc++/70607 revert recent changes to <tr1/complex>

	PR libstdc++/70607
	* include/tr1/complex (conj): Remove using-declaration and restore
	overloads, reverting previous change.

From-SVN: r244951
---
 libstdc++-v3/ChangeLog           |  4 ++++
 libstdc++-v3/include/tr1/complex | 12 +++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ceb15b0a304..caa49007dfb 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
 2017-01-26  Jonathan Wakely  <jwakely@redhat.com>
 
+	PR libstdc++/70607
+	* include/tr1/complex (conj): Remove using-declaration and restore
+	overloads, reverting previous change.
+
 	* testsuite/23_containers/list/operations/78389.cc: Fix for C++11
 	mode.
 	* testsuite/23_containers/priority_queue/requirements/constructible.cc:
diff --git a/libstdc++-v3/include/tr1/complex b/libstdc++-v3/include/tr1/complex
index 06f9ab0fcd8..10dce9d1bb4 100644
--- a/libstdc++-v3/include/tr1/complex
+++ b/libstdc++-v3/include/tr1/complex
@@ -371,7 +371,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     }
 
   using std::arg;
-  using std::conj;
+
+  template<typename _Tp>
+    inline std::complex<_Tp>
+    conj(const std::complex<_Tp>& __z)
+    { return std::conj(__z); }
+
+  template<typename _Tp>
+    inline std::complex<typename __gnu_cxx::__promote<_Tp>::__type>
+    conj(_Tp __x)
+    { return __x; }
+
   using std::imag;
   using std::norm;
   using std::polar;
-- 
2.30.2