Mercurial > hg > octave-lyh

diff liboctave/dDiagMatrix.h @ 3504:5eef8a2294bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-02-01 10:06:51 by jwe]
author jwe
date Tue, 01 Feb 2000 10:07:26 +0000
parents 8b262e771614
children 2923f52d8fda
line wrap: on
line diff
--- a/liboctave/dDiagMatrix.h
+++ b/liboctave/dDiagMatrix.h
@@ -90,11 +90,6 @@
   DiagMatrix& operator += (const DiagMatrix& a);
   DiagMatrix& operator -= (const DiagMatrix& a);
 
-  // diagonal matrix by diagonal matrix -> diagonal matrix operations
-
-  friend DiagMatrix operator * (const DiagMatrix& a,
-				const DiagMatrix& b);
-
   // other operations
 
   ColumnVector diag (void) const;
@@ -102,13 +97,18 @@
 
   // i/o
 
-  friend ostream& operator << (ostream& os, const DiagMatrix& a);
+  friend std::ostream& operator << (std::ostream& os, const DiagMatrix& a);
 
 private:
 
   DiagMatrix (double *d, int nr, int nc) : MDiagArray2<double> (d, nr, nc) { }
 };
 
+// diagonal matrix by diagonal matrix -> diagonal matrix operations
+
+DiagMatrix
+operator * (const DiagMatrix& a, const DiagMatrix& b);
+
 #endif
 
 /*