aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Dos Reis <gdr@codesourcery.com>2000-11-08 03:01:39 +0000
committerGabriel Dos Reis <gdr@gcc.gnu.org>2000-11-08 03:01:39 +0000
commit6e124e38ba59ff31ef0cf3ca1866b3c076d8ab4f (patch)
tree230bbd6b79d4af73ca7addfc7910ef05f46ff421
parent6623457026dcd56ff98d3671fa038818abceaf77 (diff)
downloadgcc-6e124e38ba59ff31ef0cf3ca1866b3c076d8ab4f.zip
gcc-6e124e38ba59ff31ef0cf3ca1866b3c076d8ab4f.tar.gz
gcc-6e124e38ba59ff31ef0cf3ca1866b3c076d8ab4f.tar.bz2
* include/bits/std_complex.h (conj): Undo double removal.
From-SVN: r37311
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/bits/std_complex.h5
2 files changed, 9 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 420d838..7603efd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-06 Gabriel Dos Reis <gdr@codesourcery.com>
+
+ * include/bits/std_complex.h (conj): Undo double removal.
+
2000-11-06 Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4 (LIB_AC_PROG_CXX): Remove CXX from the list of
diff --git a/libstdc++-v3/include/bits/std_complex.h b/libstdc++-v3/include/bits/std_complex.h
index b2aaa4e..ce14dee 100644
--- a/libstdc++-v3/include/bits/std_complex.h
+++ b/libstdc++-v3/include/bits/std_complex.h
@@ -913,6 +913,11 @@ namespace std
polar(const _Tp& __rho, const _Tp& __theta)
{ return complex<_Tp>(__rho * cos(__theta), __rho * sin(__theta)); }
+ template<typename _Tp>
+ inline complex<_Tp>
+ conj(const complex<_Tp>& __z)
+ { return complex<_Tp>(__z.real(), -__z.imag()); }
+
// // We use here a few more specializations.
// template<>
// inline complex<float>