* include/bits/std_complex.h (conj): Undo double removal.

From-SVN: r37311

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 420d8381d0ef1b9c569377f8a2410a7f41428296..7603efd5377ebeea2905940b59546e05811aa024 100644 (file)
--- 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 b2aaa4e961016aad7cd0e34cc2c96728807c3633..ce14deec2fa901dcb5a11367c1f98b5974448915 100644 (file)
--- 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>