diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-31 18:11:31 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-31 18:11:31 +0000 |
| commit | d0536ae1c24499ab31b8dfc4401210762e23853b (patch) | |
| tree | e6df585ec2415ae62afae1072f6a77fb7bc137a5 /libstdc++-v3/include/bits/std_complex.h | |
| parent | 3af7dce657c1be6358d629f1b961359cd6eeada3 (diff) | |
| download | gcc-d0536ae1c24499ab31b8dfc4401210762e23853b.tar.gz | |
2000-10-31 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* include/bits/std_complex.h: Remove duplicate definition of conj.
* include/c/bits/std_cwctype.h: Consistent placement of undefs.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37161 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/std_complex.h')
| -rw-r--r-- | libstdc++-v3/include/bits/std_complex.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libstdc++-v3/include/bits/std_complex.h b/libstdc++-v3/include/bits/std_complex.h index 349d2dc6fd6..576ae86163b 100644 --- a/libstdc++-v3/include/bits/std_complex.h +++ b/libstdc++-v3/include/bits/std_complex.h @@ -177,9 +177,7 @@ namespace std friend class complex<long double>; // friend float abs<>(const complex<float>&); - friend complex<float> conj<>(const complex<float>&); - friend complex<float> cos<>(const complex<float>&); friend complex<float> cosh<>(const complex<float>&); friend complex<float> exp<>(const complex<float>&); @@ -253,7 +251,6 @@ namespace std friend class complex<long double>; // friend double abs<>(const complex<double>&); - friend complex<double> conj<>(const complex<double>&); friend complex<double> cos<>(const complex<double>&); friend complex<double> cosh<>(const complex<double>&); @@ -329,7 +326,6 @@ namespace std friend class complex<double>; // friend long double abs<>(const complex<long double>&); - friend complex<long double> conj<>(const complex<long double>&); friend complex<long double> cos<>(const complex<long double>&); friend complex<long double> cosh<>(const complex<long double>&); @@ -683,12 +679,6 @@ namespace std complex<_Tp>::complex(const complex<_Up>& __z) : _M_real(__z.real()), _M_imag(__z.imag()) { } - // 26.2.7/6 - template<typename _Tp> - inline complex<_Tp> - conj(const complex<_Tp>& __z) - { return complex<_Tp>(__z.real(), -__z.imag()); } - // 26.2.7/4 template<typename _Tp> inline _Tp @@ -949,6 +939,7 @@ namespace std polar(const _Tp& __rho, const _Tp& __theta) { return complex<_Tp>(__rho * cos(__theta), __rho * sin(__theta)); } + // 26.2.7/6 template<typename _Tp> inline complex<_Tp> conj(const complex<_Tp>& __z) |