FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR libstdc++/70607 revert recent changes to <tr1/complex>

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

From-SVN: r244951
This commit is contained in:
Jonathan Wakely 2017-01-26 19:40:02 +00:00 • committed by Jonathan Wakely
parent 881191e865
commit c86996727f
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View file

@ -1,5 +1,9 @@
2017-01-26 Jonathan Wakely <jwakely@redhat.com> 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 * testsuite/23_containers/list/operations/78389.cc: Fix for C++11
mode. mode.
* testsuite/23_containers/priority_queue/requirements/constructible.cc: * testsuite/23_containers/priority_queue/requirements/constructible.cc:

12
libstdc++-v3/include/tr1/complex
View file

@ -371,7 +371,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
using std::arg; 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::imag;
using std::norm; using std::norm;
using std::polar; using std::polar;