Mercurial > forge
diff main/fixed/src/Array-f.cc @ 9481:d84d2fea3c90 octave-forge
Re-enable compilation of fixed package
author | jordigh |
---|---|
date | Wed, 22 Feb 2012 22:07:33 +0000 |
parents | 8dcc0930589a |
children |
line wrap: on
line diff
--- a/main/fixed/src/Array-f.cc Wed Feb 22 21:56:05 2012 +0000 +++ b/main/fixed/src/Array-f.cc Wed Feb 22 22:07:33 2012 +0000 @@ -29,6 +29,30 @@ //#include "fixedMatrix.h" //#include "fixedCMatrix.h" +inline FixedPoint +xmin (const FixedPoint& x, const FixedPoint& y) +{ + return x <= y ? x : y; +} + +inline FixedPoint +xmax (const FixedPoint& x, const FixedPoint& y) +{ + return x >= y ? x : y; +} + +inline FixedPointComplex +xmin (const FixedPointComplex& x, const FixedPointComplex& y) +{ + return x <= y ? x : y; +} + +inline FixedPointComplex +xmax (const FixedPointComplex& x, const FixedPointComplex& y) +{ + return x >= y ? x : y; +} + #include <octave/Array.h> #include <octave/Array.cc> #include <octave/MArray.h> @@ -50,38 +74,13 @@ (arg (a) > arg (b)))); } -INSTANTIATE_ARRAY(FixedPoint, OCTAVE_FIXED_API); +INSTANTIATE_ARRAY (FixedPoint, ); template class MArray<FixedPoint>; -INSTANTIATE_ARRAY(FixedPointComplex, OCTAVE_FIXED_API); -template class MArray<FixedPointComplex>; - INSTANTIATE_MARRAY_FRIENDS (FixedPoint, ) -INSTANTIATE_MARRAY_FRIENDS (FixedPointComplex, ) - -#include <octave/Array2.h> -#include <octave/MArray2.h> -#include <octave/MArray2.cc> -template class Array2<FixedPoint>; -template class MArray2<FixedPoint>; -template class Array2<FixedPointComplex>; -template class MArray2<FixedPointComplex>; - -INSTANTIATE_MARRAY2_FRIENDS (FixedPoint, OCTAVE_FIXED_API) -INSTANTIATE_MARRAY2_FRIENDS (FixedPointComplex, OCTAVE_FIXED_API) - -#include <octave/ArrayN.h> -#include <octave/ArrayN.cc> -#include <octave/MArrayN.h> -#include <octave/MArrayN.cc> - -template class ArrayN<FixedPoint>; -template class MArrayN<FixedPoint>; -template class ArrayN<FixedPointComplex>; -template class MArrayN<FixedPointComplex>; - -INSTANTIATE_MARRAYN_FRIENDS (FixedPoint, ) -INSTANTIATE_MARRAYN_FRIENDS (FixedPointComplex, ) +INSTANTIATE_ARRAY (FixedPointComplex, ); +template class MArray<FixedPointComplex>; +INSTANTIATE_MARRAY_FRIENDS (FixedPointComplex, ) /* ;;; Local Variables: ***