From: David B. <Dav...@mo...> - 2004-06-21 09:24:07
|
Dapr=E8s Per Persson <per...@ma...> (le 21/06/2004): > David, > thanks for looking into this. There is one thing I don't understand: >=20 > I need to place the instantiation (macros or not) within #ifdef=20 > HAVE_ND_ARRAYS ... > while you place it inside the opposite #ifndef HAVE_ND_ARRAYS ... >=20 > Things are still broken on OS X with the latest commit... :-( You're right, again my fault.... Changed it around... D. >=20 > /Per >=20 >=20 > On Jun 21, 2004, at 09:36, David Bateman wrote: >=20 > >Update of /cvsroot/octave/octave-forge/main/fixed > >In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21496 > > > >Modified Files: > > Array-f.cc > >Log Message: > >Use INSTANTIAT_ARRAY_CAT macro > > > >Index: Array-f.cc > >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >RCS file: /cvsroot/octave/octave-forge/main/fixed/Array-f.cc,v > >retrieving revision 1.3 > >retrieving revision 1.4 > >diff -u -d -r1.3 -r1.4 > >--- Array-f.cc 16 Jun 2004 11:22:20 -0000 1.3 > >+++ Array-f.cc 21 Jun 2004 07:36:52 -0000 1.4 > >@@ -71,11 +71,8 @@ > > template class MArray2<FixedPointComplex>; > > > > #ifndef HAVE_ND_ARRAYS > >-template int cat_ra (Array<FixedPoint>& ra, const Array<FixedPoint>&=20 > >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); > >+INSTANTIATE_ARRAY_CAT (FixedPoint); > >+INSTANTIATE_ARRAY_CAT (FixedPointComplex); > > > > template int assign (Array2<FixedPoint>&, const Array2<FixedPoint>&); > > template int assign (Array2<FixedPointComplex>&, const=20 > >Array2<FixedPoint>&); > > > > > > > >------------------------------------------------------- > >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, C= A > >REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code=20 > >NWMGYKND > >_______________________________________________ > >octave-cvsupdate mailing list > >oct...@li... > >https://lists.sourceforge.net/lists/listinfo/octave-cvsupdate > > >=20 >=20 >=20 > ------------------------------------------------------- > 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 NWMGYKN= D > _______________________________________________ > Octave-dev mailing list > Oct...@li... > https://lists.sourceforge.net/lists/listinfo/octave-dev --=20 David Bateman Dav...@mo... Motorola CRM +33 1 69 35 48 04 (Ph)=20 Parc Les Algorithmes, Commune de St Aubin +33 1 69 35 77 01 (Fax)=20 91193 Gif-Sur-Yvette FRANCE The information contained in this communication has been classified as:=20 [x] General Business Information=20 [ ] Motorola Internal Use Only=20 [ ] Motorola Confidential Proprietary |