Mercurial > hg > octave-nkf

diff liboctave/MArray-d.cc @ 1989:a4b0826e240c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1996-03-02 00:33:22 by jwe]
author jwe
date Sat, 02 Mar 1996 00:34:12 +0000
parents 1281a23a34dd
children 1b57120c997b
line wrap: on
line diff
--- a/liboctave/MArray-d.cc
+++ b/liboctave/MArray-d.cc
@@ -27,107 +27,22 @@
 #include "MArray.cc"
 
 template class MArray<double>;
-template class MArray2<double>;
-template class MDiagArray<double>;
 
-template MArray<double>
-operator + (const MArray<double>& a, const double& s);
-
-template MArray<double>
-operator - (const MArray<double>& a, const double& s);
-
-template MArray<double>
-operator * (const MArray<double>& a, const double& s);
-
-template MArray<double>
-operator / (const MArray<double>& a, const double& s);
-
-template MArray<double>
-operator + (const double& s, const MArray<double>& a);
-
-template MArray<double>
-operator - (const double& s, const MArray<double>& a);
-
-template MArray<double>
-operator * (const double& s, const MArray<double>& a);
+INSTANTIATE_MARRAY_FRIENDS (double)
 
-template MArray<double>
-operator / (const double& s, const MArray<double>& a);
-
-template MArray<double>
-operator + (const MArray<double>& a, const MArray<double>& b);
-
-template MArray<double>
-operator - (const MArray<double>& a, const MArray<double>& b);
-
-template MArray<double>
-product (const MArray<double>& a, const MArray<double>& b); 
+#include "MArray2.h"
+#include "MArray2.cc"
 
-template MArray<double>
-quotient (const MArray<double>& a, const MArray<double>& b);
-
-template MArray<double>
-operator - (const MArray<double>& a);
-
-template MArray2<double>
-operator + (const MArray2<double>& a, const double& s);
-
-template MArray2<double>
-operator - (const MArray2<double>& a, const double& s);
-
-template MArray2<double>
-operator * (const MArray2<double>& a, const double& s);
+template class MArray2<double>;
 
-template MArray2<double>
-operator / (const MArray2<double>& a, const double& s);
-
-template MArray2<double>
-operator + (const double& s, const MArray2<double>& a);
-
-template MArray2<double>
-operator - (const double& s, const MArray2<double>& a);
-
-template MArray2<double>
-operator * (const double& s, const MArray2<double>& a);
-
-template MArray2<double>
-operator / (const double& s, const MArray2<double>& a);
-
-template MArray2<double>
-operator + (const MArray2<double>& a, const MArray2<double>& b);
-
-template MArray2<double>
-operator - (const MArray2<double>& a, const MArray2<double>& b);
-
-template MArray2<double>
-product (const MArray2<double>& a, const MArray2<double>& b);
+INSTANTIATE_MARRAY2_FRIENDS (double)
 
-template MArray2<double>
-quotient (const MArray2<double>& a, const MArray2<double>& b);
-
-template MArray2<double>
-operator - (const MArray2<double>& a);
-
-template MDiagArray<double>
-operator * (const MDiagArray<double>& a, const double& s);
-
-template MDiagArray<double>
-operator / (const MDiagArray<double>& a, const double& s);
+#include "MDiagArray2.h"
+#include "MDiagArray2.cc"
 
-template MDiagArray<double>
-operator * (const double& s, const MDiagArray<double>& a);
-
-template MDiagArray<double>
-operator + (const MDiagArray<double>& a, const MDiagArray<double>& b);
+template class MDiagArray2<double>;
 
-template MDiagArray<double>
-operator - (const MDiagArray<double>& a, const MDiagArray<double>& b);
-
-template MDiagArray<double>
-product (const MDiagArray<double>& a, const MDiagArray<double>& b);
-
-template MDiagArray<double>
-operator - (const MDiagArray<double>& a);
+INSTANTIATE_MDIAGARRAY_FRIENDS (double)
 
 /*
 ;;; Local Variables: ***