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 + 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 + inline std::complex<_Tp> + conj(const std::complex<_Tp>& __z) + { return std::conj(__z); } + + template + inline std::complex::__type> + conj(_Tp __x) + { return __x; } + using std::imag; using std::norm; using std::polar;