1 files changed, 4 insertions, 34 deletions

diff --git a/libstdc++/std/dcomplex.h b/libstdc++/std/dcomplex.h
index fde3f09ca5c..5bc329c9bc9 100644
--- a/libstdc++/std/dcomplex.h
+++ b/libstdc++/std/dcomplex.h
@@ -50,40 +50,10 @@ public:
 private:
   double re, im;
 
-  friend complex& __doapl (complex *, const complex&);
-  friend complex& __doami (complex *, const complex&);
-  friend complex& __doaml (complex *, const complex&);
-  friend complex& __doadv (complex *, const complex&);
-
-  // These functions are specified as friends for purposes of name injection;
-  // they do not actually reference private members.
-  friend double real (const complex& x) { return x.real (); }
-  friend double imag (const complex& x) { return x.imag (); }
-  friend complex operator + (const complex&, const complex&) __attribute__ ((const));
-  friend complex operator + (const complex&, double) __attribute__ ((const));
-  friend complex operator + (double, const complex&) __attribute__ ((const));
-  friend complex operator - (const complex&, const complex&) __attribute__ ((const));
-  friend complex operator - (const complex&, double) __attribute__ ((const));
-  friend complex operator - (double, const complex&) __attribute__ ((const));
-  friend complex operator * (const complex&, const complex&) __attribute__ ((const));
-  friend complex operator * (const complex&, double) __attribute__ ((const));
-  friend complex operator * (double, const complex&) __attribute__ ((const));
-  friend complex operator / (const complex&, const complex&) __attribute__ ((const));
-  friend complex operator / (const complex&, double) __attribute__ ((const));
-  friend complex operator / (double, const complex&) __attribute__ ((const));
-  friend bool operator == (const complex&, const complex&) __attribute__ ((const));
-  friend bool operator == (const complex&, double) __attribute__ ((const));
-  friend bool operator == (double, const complex&) __attribute__ ((const));
-  friend bool operator != (const complex&, const complex&) __attribute__ ((const));
-  friend bool operator != (const complex&, double) __attribute__ ((const));
-  friend bool operator != (double, const complex&) __attribute__ ((const));
-  friend complex polar (double, double) __attribute__ ((const));
-  friend complex pow (const complex&, const complex&) __attribute__ ((const));
-  friend complex pow (const complex&, double) __attribute__ ((const));
-  friend complex pow (const complex&, int) __attribute__ ((const));
-  friend complex pow (double, const complex&) __attribute__ ((const));
-  friend istream& operator>> (istream&, complex&);
-  friend ostream& operator<< (ostream&, const complex&);
+  friend complex& __doapl<> (complex *, const complex&);
+  friend complex& __doami<> (complex *, const complex&);
+  friend complex& __doaml<> (complex *, const complex&);
+  friend complex& __doadv<> (complex *, const complex&);
 };
 
 inline complex<float>::complex (const complex<double>& r)