summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4>2000-11-08 03:01:39 +0000
committergdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4>2000-11-08 03:01:39 +0000
commit307f5d0fa55d44ab4f729333095b2cfa17bca08b (patch)
tree230bbd6b79d4af73ca7addfc7910ef05f46ff421
parent1134a0280f4d6354a8e8576525da101d770dc906 (diff)
downloadgcc-307f5d0fa55d44ab4f729333095b2cfa17bca08b.tar.gz
* include/bits/std_complex.h (conj): Undo double removal.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37311 138bc75d-0d04-0410-961f-82ee72b054a4
-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 420d8381d0e..7603efd5377 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 b2aaa4e9610..ce14deec2fa 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>