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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ceb15b0a304910abb7ee45f3bd7406b451790d86..caa49007dfb7d944f165011bfed505797e44cfb6 100644 (file)
--- 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 06f9ab0fcd8f34e321e8c03a8907619630c0ff52..10dce9d1bb4ab7ab7192ba189179b465e643ef15 100644 (file)
--- 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;