Mercurial > hg > octave-nkf

diff liboctave/MArray-s.cc @ 1985:a9abae46d75f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1996-03-01 14:33:13 by jwe]
author jwe
date Fri, 01 Mar 1996 14:33:23 +0000
parents 1281a23a34dd
children a4b0826e240c
line wrap: on
line diff
--- a/liboctave/MArray-s.cc
+++ b/liboctave/MArray-s.cc
@@ -31,109 +31,13 @@
 template class MArray<short>;
 template class MArray2<short>;
 
+INSTANTIATE_MARRAY_FRIENDS (short)
+INSTANTIATE_MARRAY2_FRIENDS (short)
+
 #ifndef NO_DIAG_ARRAY
 template class MDiagArray<short>;
-#endif
 
-template MArray<short>
-operator + (const MArray<short>& a, const short& s);
-
-template MArray<short>
-operator - (const MArray<short>& a, const short& s);
-
-template MArray<short>
-operator * (const MArray<short>& a, const short& s);
-
-template MArray<short>
-operator / (const MArray<short>& a, const short& s);
-
-template MArray<short>
-operator + (const short& s, const MArray<short>& a);
-
-template MArray<short>
-operator - (const short& s, const MArray<short>& a);
-
-template MArray<short>
-operator * (const short& s, const MArray<short>& a);
-
-template MArray<short>
-operator / (const short& s, const MArray<short>& a);
-
-template MArray<short>
-operator + (const MArray<short>& a, const MArray<short>& b);
-
-template MArray<short>
-operator - (const MArray<short>& a, const MArray<short>& b);
-
-template MArray<short>
-product (const MArray<short>& a, const MArray<short>& b); 
-
-template MArray<short>
-quotient (const MArray<short>& a, const MArray<short>& b);
-
-template MArray<short>
-operator - (const MArray<short>& a);
-
-template MArray2<short>
-operator + (const MArray2<short>& a, const short& s);
-
-template MArray2<short>
-operator - (const MArray2<short>& a, const short& s);
-
-template MArray2<short>
-operator * (const MArray2<short>& a, const short& s);
-
-template MArray2<short>
-operator / (const MArray2<short>& a, const short& s);
-
-template MArray2<short>
-operator + (const short& s, const MArray2<short>& a);
-
-template MArray2<short>
-operator - (const short& s, const MArray2<short>& a);
-
-template MArray2<short>
-operator * (const short& s, const MArray2<short>& a);
-
-template MArray2<short>
-operator / (const short& s, const MArray2<short>& a);
-
-template MArray2<short>
-operator + (const MArray2<short>& a, const MArray2<short>& b);
-
-template MArray2<short>
-operator - (const MArray2<short>& a, const MArray2<short>& b);
-
-template MArray2<short>
-product (const MArray2<short>& a, const MArray2<short>& b);
-
-template MArray2<short>
-quotient (const MArray2<short>& a, const MArray2<short>& b);
-
-template MArray2<short>
-operator - (const MArray2<short>& a);
-
-#ifndef NO_DIAG_ARRAY
-template MDiagArray<short>
-operator * (const MDiagArray<short>& a, const short& s);
-
-template MDiagArray<short>
-operator / (const MDiagArray<short>& a, const short& s);
-
-template MDiagArray<short>
-operator * (const short& s, const MDiagArray<short>& a);
-
-template MDiagArray<short>
-operator + (const MDiagArray<short>& a, const MDiagArray<short>& b);
-
-template MDiagArray<short>
-operator - (const MDiagArray<short>& a, const MDiagArray<short>& b);
-
-template MDiagArray<short>
-product (const MDiagArray<short>& a, const MDiagArray<short>& b);
-
-template MDiagArray<short>
-operator - (const MDiagArray<short>& a);
+INSTANTIATE_MDIAGARRAY_FRIENDS (short)
 #endif
 
 /*