[OctDev] Fixed still broken on OS X

[Per P. <per...@ma...>]

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>;