changeset 3645:529c00d3210c octave-forge

upgrade to newer macro API in octave
author goffioul
date Fri, 13 Jul 2007 09:20:20 +0000
parents 867552dd5aa7
children 8ab378db1538
files main/comm/DESCRIPTION main/comm/src/galois.h main/fixed/DESCRIPTION main/fixed/src/Array-f.cc main/fixed/src/fixedCMatrix.h main/fixed/src/fixedCNDArray.h main/fixed/src/fixedMatrix.h main/fixed/src/fixedNDArray.h
diffstat 8 files changed, 35 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/main/comm/DESCRIPTION	Thu Jul 12 18:38:06 2007 +0000
+++ b/main/comm/DESCRIPTION	Fri Jul 13 09:20:20 2007 +0000
@@ -5,7 +5,7 @@
 Maintainer: David Bateman
 Title: Communications.
 Description: Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields
-Depends: octave (> 2.9.9), signal (>= 1.0.0)
+Depends: octave (> 2.9.12), signal (>= 1.0.0)
 Autoload: yes
 License: GPL version 2 or later
 Url: http://octave.sf.net
--- a/main/comm/src/galois.h	Thu Jul 12 18:38:06 2007 +0000
+++ b/main/comm/src/galois.h	Fri Jul 13 09:20:20 2007 +0000
@@ -206,9 +206,9 @@
 galois operator * (const galois& a, const Matrix& b);
 galois operator * (const Matrix& a, const galois& b);
 
-MM_OP_DECLS(galois, galois, galois);
-MM_OP_DECLS(galois, galois, Matrix);
-MM_OP_DECLS(galois, Matrix, galois);
+MM_OP_DECLS(galois, galois, galois, );
+MM_OP_DECLS(galois, galois, Matrix, );
+MM_OP_DECLS(galois, Matrix, galois, );
 
 #endif
 
--- a/main/fixed/DESCRIPTION	Thu Jul 12 18:38:06 2007 +0000
+++ b/main/fixed/DESCRIPTION	Fri Jul 13 09:20:20 2007 +0000
@@ -5,7 +5,7 @@
 Maintainer: David Bateman
 Title: Fixed Point Computations.
 Description: Fixed point real and complex matrix toolbox
-Depends: octave (>= 2.9.7)
+Depends: octave (> 2.9.12)
 Autoload: yes
 License: GPL version 2 or later
 Url: http://octave.sf.net
--- a/main/fixed/src/Array-f.cc	Thu Jul 12 18:38:06 2007 +0000
+++ b/main/fixed/src/Array-f.cc	Fri Jul 13 09:20:20 2007 +0000
@@ -51,8 +51,8 @@
 template int assign (Array<FixedPointComplex>&, 
 		const Array<FixedPointComplex>&, const FixedPointComplex&);
 
-INSTANTIATE_MARRAY_FRIENDS (FixedPoint)
-INSTANTIATE_MARRAY_FRIENDS (FixedPointComplex)
+INSTANTIATE_MARRAY_FRIENDS (FixedPoint, )
+INSTANTIATE_MARRAY_FRIENDS (FixedPointComplex, )
 
 #include <octave/Array2.h>
 #include <octave/MArray2.h>
@@ -63,8 +63,8 @@
 template class Array2<FixedPointComplex>;
 template class MArray2<FixedPointComplex>;
 
-INSTANTIATE_MARRAY2_FRIENDS (FixedPoint)
-INSTANTIATE_MARRAY2_FRIENDS (FixedPointComplex)
+INSTANTIATE_MARRAY2_FRIENDS (FixedPoint, OCTAVE_FIXED_API)
+INSTANTIATE_MARRAY2_FRIENDS (FixedPointComplex, OCTAVE_FIXED_API)
 
 #include <octave/ArrayN.h>
 #include <octave/ArrayN.cc>
@@ -76,8 +76,8 @@
 template class ArrayN<FixedPointComplex>;
 template class MArrayN<FixedPointComplex>;
 
-INSTANTIATE_MARRAYN_FRIENDS (FixedPoint)
-INSTANTIATE_MARRAYN_FRIENDS (FixedPointComplex)
+INSTANTIATE_MARRAYN_FRIENDS (FixedPoint, )
+INSTANTIATE_MARRAYN_FRIENDS (FixedPointComplex, )
 
 /*
 ;;; Local Variables: ***
--- a/main/fixed/src/fixedCMatrix.h	Thu Jul 12 18:38:06 2007 +0000
+++ b/main/fixed/src/fixedCMatrix.h	Fri Jul 13 09:20:20 2007 +0000
@@ -392,14 +392,14 @@
 			     const FixedComplexMatrix &b);
 
 
-MS_CMP_OP_DECLS (FixedComplexMatrix, FixedPointComplex)
-MS_BOOL_OP_DECLS (FixedComplexMatrix, FixedPointComplex)
+MS_CMP_OP_DECLS (FixedComplexMatrix, FixedPointComplex, )
+MS_BOOL_OP_DECLS (FixedComplexMatrix, FixedPointComplex, )
 
-SM_CMP_OP_DECLS (FixedPointComplex, FixedComplexMatrix)
-SM_BOOL_OP_DECLS (FixedPointComplex, FixedComplexMatrix)
+SM_CMP_OP_DECLS (FixedPointComplex, FixedComplexMatrix, )
+SM_BOOL_OP_DECLS (FixedPointComplex, FixedComplexMatrix, )
 
-MM_CMP_OP_DECLS (FixedComplexMatrix, FixedComplexMatrix)
-MM_BOOL_OP_DECLS (FixedComplexMatrix, FixedComplexMatrix)
+MM_CMP_OP_DECLS (FixedComplexMatrix, FixedComplexMatrix, )
+MM_BOOL_OP_DECLS (FixedComplexMatrix, FixedComplexMatrix, )
 
 MARRAY_FORWARD_DEFS (MArray2, FixedComplexMatrix, FixedPointComplex)
 
--- a/main/fixed/src/fixedCNDArray.h	Thu Jul 12 18:38:06 2007 +0000
+++ b/main/fixed/src/fixedCNDArray.h	Fri Jul 13 09:20:20 2007 +0000
@@ -321,14 +321,14 @@
 FixedComplexNDArray elem_pow (const FixedPointComplex &a,
 			      const FixedComplexNDArray &b);
 
-NDS_CMP_OP_DECLS (FixedComplexNDArray, FixedPointComplex)
-NDS_BOOL_OP_DECLS (FixedComplexNDArray, FixedPointComplex)
+NDS_CMP_OP_DECLS (FixedComplexNDArray, FixedPointComplex, )
+NDS_BOOL_OP_DECLS (FixedComplexNDArray, FixedPointComplex, )
 
-SND_CMP_OP_DECLS (FixedPointComplex, FixedComplexNDArray)
-SND_BOOL_OP_DECLS (FixedPointComplex, FixedComplexNDArray)
+SND_CMP_OP_DECLS (FixedPointComplex, FixedComplexNDArray, )
+SND_BOOL_OP_DECLS (FixedPointComplex, FixedComplexNDArray, )
 
-NDND_CMP_OP_DECLS (FixedComplexNDArray, FixedComplexNDArray)
-NDND_BOOL_OP_DECLS (FixedComplexNDArray, FixedComplexNDArray)
+NDND_CMP_OP_DECLS (FixedComplexNDArray, FixedComplexNDArray, )
+NDND_BOOL_OP_DECLS (FixedComplexNDArray, FixedComplexNDArray, )
 
 MARRAY_FORWARD_DEFS (MArrayN, FixedComplexNDArray, FixedPointComplex)
 
--- a/main/fixed/src/fixedMatrix.h	Thu Jul 12 18:38:06 2007 +0000
+++ b/main/fixed/src/fixedMatrix.h	Fri Jul 13 09:20:20 2007 +0000
@@ -302,14 +302,14 @@
 OCTAVE_FIXED_API FixedMatrix elem_pow (const FixedPoint &a, const FixedMatrix &b);
 
 
-MS_CMP_OP_DECLS (FixedMatrix, FixedPoint)
-MS_BOOL_OP_DECLS (FixedMatrix, FixedPoint)
+MS_CMP_OP_DECLS (FixedMatrix, FixedPoint, )
+MS_BOOL_OP_DECLS (FixedMatrix, FixedPoint, )
 
-SM_CMP_OP_DECLS (FixedPoint, FixedMatrix)
-SM_BOOL_OP_DECLS (FixedPoint, FixedMatrix)
+SM_CMP_OP_DECLS (FixedPoint, FixedMatrix, )
+SM_BOOL_OP_DECLS (FixedPoint, FixedMatrix, )
 
-MM_CMP_OP_DECLS (FixedMatrix, FixedMatrix)
-MM_BOOL_OP_DECLS (FixedMatrix, FixedMatrix)
+MM_CMP_OP_DECLS (FixedMatrix, FixedMatrix, )
+MM_BOOL_OP_DECLS (FixedMatrix, FixedMatrix, )
 
 MARRAY_FORWARD_DEFS (MArray2, FixedMatrix, FixedPoint)
 
--- a/main/fixed/src/fixedNDArray.h	Thu Jul 12 18:38:06 2007 +0000
+++ b/main/fixed/src/fixedNDArray.h	Fri Jul 13 09:20:20 2007 +0000
@@ -239,14 +239,14 @@
 FixedNDArray elem_pow (const FixedNDArray &a, const FixedPoint &b);
 FixedNDArray elem_pow (const FixedPoint &a, const FixedNDArray &b);
 
-NDS_CMP_OP_DECLS (FixedNDArray, FixedPoint)
-NDS_BOOL_OP_DECLS (FixedNDArray, FixedPoint)
+NDS_CMP_OP_DECLS (FixedNDArray, FixedPoint, )
+NDS_BOOL_OP_DECLS (FixedNDArray, FixedPoint, )
 
-SND_CMP_OP_DECLS (FixedPoint, FixedNDArray)
-SND_BOOL_OP_DECLS (FixedPoint, FixedNDArray)
+SND_CMP_OP_DECLS (FixedPoint, FixedNDArray, )
+SND_BOOL_OP_DECLS (FixedPoint, FixedNDArray, )
 
-NDND_CMP_OP_DECLS (FixedNDArray, FixedNDArray)
-NDND_BOOL_OP_DECLS (FixedNDArray, FixedNDArray)
+NDND_CMP_OP_DECLS (FixedNDArray, FixedNDArray, )
+NDND_BOOL_OP_DECLS (FixedNDArray, FixedNDArray, )
 
 MARRAY_FORWARD_DEFS (MArrayN, FixedNDArray, FixedPoint)