* src/complex.cc (arg, polar): Comment out specializations.

	* include/bits/std_complex.h (complex<>): Remove arg<> friend
	declaration.
	(arg): Define primary template.
	(polar): Likewise.
	(conj): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37159 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 50 insertions, 33 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 416204166e0..ea5cc1d2992 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,15 @@
 2000-10-31  Gabriel Dos Reis  <gdr@codesourcery.com>
 
+	* src/complex.cc (arg, polar): Comment out specializations.
+
+	* include/bits/std_complex.h (complex<>): Remove arg<> friend
+	declaration. 
+	(arg): Define primary template.
+	(polar): Likewise.
+	(conj): Likewise.
+
+2000-10-31  Gabriel Dos Reis  <gdr@codesourcery.com>
+
 	* include/c/bits/std_cwctype.h: #undef possible function-like
 	macro definitions of iswxxx functions, which might be brought in
 	by <wctype.h>.  Those macro definitions prevent build on some
diff --git a/libstdc++-v3/include/bits/std_complex.h b/libstdc++-v3/include/bits/std_complex.h
index 056b12076f4..349d2dc6fd6 100644
--- a/libstdc++-v3/include/bits/std_complex.h
+++ b/libstdc++-v3/include/bits/std_complex.h
@@ -177,7 +177,6 @@ namespace std
     friend class complex<long double>;
 
     // friend float abs<>(const complex<float>&);
-    friend float arg<>(const complex<float>&);
 
     friend complex<float> conj<>(const complex<float>&);
 
@@ -254,7 +253,6 @@ namespace std
     friend class complex<long double>;
 
     // friend double abs<>(const complex<double>&);
-    friend double arg<>(const complex<double>&);
 
     friend complex<double> conj<>(const complex<double>&);
     friend complex<double> cos<>(const complex<double>&);
@@ -331,7 +329,6 @@ namespace std
     friend class complex<double>;
 
     // friend long double abs<>(const complex<long double>&);
-    friend long double arg<>(const complex<long double>&);
 
     friend complex<long double> conj<>(const complex<long double>&);
     friend complex<long double> cos<>(const complex<long double>&);
@@ -886,12 +883,12 @@ namespace std
   template<typename _Tp>
     inline bool
     operator==(const complex<_Tp>& __x, const _Tp& __y)
-    { return __x.real() == __y && __x.imag() == 0; }
+    { return __x.real() == __y && __x.imag() == _Tp(); }
 
   template<typename _Tp>
     inline bool
     operator==(const _Tp& __x, const complex<_Tp>& __y)
-    { return __x == __y.real() && 0 == __y.imag(); }
+    { return __x == __y.real() && _Tp() == __y.imag(); }
 
   template<typename _Tp>
     inline bool
@@ -901,12 +898,12 @@ namespace std
   template<typename _Tp>
     inline bool
     operator!=(const complex<_Tp>& __x, const _Tp& __y)
-    { return __x.real() != __y || __x.imag() != 0; }
+    { return __x.real() != __y || __x.imag() != _Tp(); }
 
   template<typename _Tp>
     inline bool
     operator!=(const _Tp& __x, const complex<_Tp>& __y)
-    { return __x != __y.real() || 0 != __y.imag(); }
+    { return __x != __y.real() || _Tp() != __y.imag(); }
 
   template<typename _Tp, typename _CharT, class _Traits>
     basic_istream<_CharT, _Traits>&
@@ -940,7 +937,22 @@ namespace std
       __x /= __s; __y /= __s;
       return __s * sqrt(__x * __x + __y * __y);
     }
-    
+
+  template<typename _Tp>
+    inline _Tp
+    arg(const complex<_Tp>& __z)
+    { return atan2(__z.imag(), __z.real()); }
+
+
+  template<typename _Tp>
+    inline complex<_Tp>
+    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<>
diff --git a/libstdc++-v3/src/complex.cc b/libstdc++-v3/src/complex.cc
index 2f7cfc48a60..d1c5df237d4 100644
--- a/libstdc++-v3/src/complex.cc
+++ b/libstdc++-v3/src/complex.cc
@@ -54,27 +54,27 @@ namespace std
 //      return hypot (__real__ __x._M_value, __imag__ __x._M_value); 
 //    }
 
-  template<>
-  FLT
-  arg(const complex<FLT>& __x)
-  { return carg(__x._M_value); }
+//    template<>
+//    FLT
+//    arg(const complex<FLT>& __x)
+//    { return carg(__x._M_value); }
 
-  template<>
-  complex<FLT>
-  polar(const FLT& __rho, const FLT& __theta)
-  {
-#if 0
-// XXX
-// defined(_GLIBCPP_HAVE_SINCOS) && !defined(__osf__)
-    // Although sincos does exist on OSF3.2 and OSF4.0 we cannot use it
-    // since the necessary types are not defined in the headers.
-    FLT __sinx, __cosx;
-    sincos(__theta, &__sinx, &__cosx);
-    return complex<FLT>(__rho * __cosx, __rho * __sinx);
-#else
-    return complex<FLT>(__rho * cos(__theta), __rho * sin(__theta));
-#endif
-  }
+//    template<>
+//    complex<FLT>
+//    polar(const FLT& __rho, const FLT& __theta)
+//    {
+//  #if 0
+//  // XXX
+//  // defined(_GLIBCPP_HAVE_SINCOS) && !defined(__osf__)
+//      // Although sincos does exist on OSF3.2 and OSF4.0 we cannot use it
+//      // since the necessary types are not defined in the headers.
+//      FLT __sinx, __cosx;
+//      sincos(__theta, &__sinx, &__cosx);
+//      return complex<FLT>(__rho * __cosx, __rho * __sinx);
+//  #else
+//      return complex<FLT>(__rho * cos(__theta), __rho * sin(__theta));
+//  #endif
+//    }
 
   template<>
   complex<FLT>
@@ -147,8 +147,3 @@ namespace std
   { return complex<FLT>(ctanh(__x._M_value)); }
   
 } // namespace std
-
-
-
-
-