Menu
▾
▴
[Octave-cvsupdate] octave-forge/main/fixed/src Array-f.cc, 1.5, 1.6 fixedCMatrix.h, 1.5, 1.6 fixedCNDArray.h, 1.5, 1.6 fixedMatrix.h, 1.5, 1.6 fixedNDArray.h, 1.4, 1.5
|
From: Michael G. <gof...@us...> - 2007-07-13 09:20:22
|
Update of /cvsroot/octave/octave-forge/main/fixed/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31396/src Modified Files: Array-f.cc fixedCMatrix.h fixedCNDArray.h fixedMatrix.h fixedNDArray.h Log Message: upgrade to newer macro API in octave Index: fixedCNDArray.h =================================================================== RCS file: /cvsroot/octave/octave-forge/main/fixed/src/fixedCNDArray.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- fixedCNDArray.h 23 Mar 2007 20:59:54 -0000 1.5 +++ fixedCNDArray.h 13 Jul 2007 09:20:20 -0000 1.6 @@ -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) Index: Array-f.cc =================================================================== RCS file: /cvsroot/octave/octave-forge/main/fixed/src/Array-f.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Array-f.cc 23 Mar 2007 20:59:52 -0000 1.5 +++ Array-f.cc 13 Jul 2007 09:20:20 -0000 1.6 @@ -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: *** Index: fixedCMatrix.h =================================================================== RCS file: /cvsroot/octave/octave-forge/main/fixed/src/fixedCMatrix.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- fixedCMatrix.h 23 Mar 2007 20:59:53 -0000 1.5 +++ fixedCMatrix.h 13 Jul 2007 09:20:20 -0000 1.6 @@ -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) Index: fixedMatrix.h =================================================================== RCS file: /cvsroot/octave/octave-forge/main/fixed/src/fixedMatrix.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- fixedMatrix.h 23 Mar 2007 20:59:55 -0000 1.5 +++ fixedMatrix.h 13 Jul 2007 09:20:20 -0000 1.6 @@ -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) Index: fixedNDArray.h =================================================================== RCS file: /cvsroot/octave/octave-forge/main/fixed/src/fixedNDArray.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- fixedNDArray.h 23 Mar 2007 20:59:55 -0000 1.4 +++ fixedNDArray.h 13 Jul 2007 09:20:20 -0000 1.5 @@ -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) |