Re: [OctDev] Fixed still broken on OS X

[David B. <Dav...@mo...>]

I can't use the macro INSTATIATE_ARRAY_CAT as it only exists on the
most recent versions of octave. If I use it a 2.1.53 build will fail.
However, thinking about, as the template for cat_ra doesn't exist
either, I'm already in that case... Arrrggghhhh... Ok what is the
minimum build requirements for the next release of octave-forge?
2.1.50 and 2.1.57? If that is the case your fix is right.....

Cheers
David



According to Per Persson <per...@ma...> (on 06/19/04):
> David,
> fixed is still broken on OS X, I should have checked sooner but got 
> distracted.
> 
> On Jun 16, 2004, at 13:15, David Bateman wrote:
> 
> >You are right that they need to be instantiated. But cat_ra is an
> >NDArray thing and so should be in "#ifdef HAVE_ND_ARRAYS ... #endif".
>                                      ^^^^^^^^^^^^^^^^^^^^
> Right now the fix is conditioned on #ifndef HAVE_ND_ARRAYS ...
> How about the following patch?
> 
> /Per
> 
> 
> Index: Array-f.cc
> ===================================================================
> RCS file: /cvsroot/octave/octave-forge/main/fixed/Array-f.cc,v
> retrieving revision 1.3
> diff -u -d -b -w -r1.3 Array-f.cc
> --- Array-f.cc  16 Jun 2004 11:22:20 -0000      1.3
> +++ Array-f.cc  19 Jun 2004 14:35:48 -0000
> @@ -71,12 +71,6 @@
>  template class MArray2<FixedPointComplex>;
> 
>  #ifndef HAVE_ND_ARRAYS
> -template int cat_ra (Array<FixedPoint>& ra, const Array<FixedPoint>& 
> ra_arg,
> -                    int dim, int idx, int move);
> -template int cat_ra (Array<FixedPointComplex>& ra,
> -                    const Array<FixedPointComplex>& ra_arg,
> -                    int dim, int idx, int move);
> -
>  template int assign (Array2<FixedPoint>&, const Array2<FixedPoint>&);
>  template int assign (Array2<FixedPointComplex>&, const 
> Array2<FixedPoint>&);
>  template int assign (Array2<FixedPointComplex>&,
> @@ -99,6 +93,9 @@
>  #include <octave/MArrayN.h>
>  #include <octave/MArrayN.cc>
> 
> +INSTANTIATE_ARRAY_CAT (FixedPoint);
> +INSTANTIATE_ARRAY_CAT (FixedPointComplex);
> +
>  template class ArrayN<FixedPoint>;
>  template class MArrayN<FixedPoint>;
>  template class ArrayN<FixedPointComplex>;
> 
> 
> 
> 
> -------------------------------------------------------
> This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
> Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
> Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
> REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
> _______________________________________________
> Octave-dev mailing list
> Oct...@li...
> https://lists.sourceforge.net/lists/listinfo/octave-dev

-- 
David Bateman                                Dav...@mo...
Motorola CRM                                 +33 1 69 35 48 04 (Ph) 
Parc Les Algorithmes, Commune de St Aubin    +33 1 69 35 77 01 (Fax) 
91193 Gif-Sur-Yvette FRANCE

The information contained in this communication has been classified as: 

[x] General Business Information 
[ ] Motorola Internal Use Only 
[ ] Motorola Confidential Proprietary