Mercurial > hg > octave-lyh
diff liboctave/Array.h @ 4806:d3bd9c04147f
[project @ 2004-03-02 05:12:32 by jwe]
author | jwe |
---|---|
date | Tue, 02 Mar 2004 05:12:33 +0000 |
parents | fc316bde0053 |
children | 8f669cc5a901 |
line wrap: on
line diff
--- a/liboctave/Array.h +++ b/liboctave/Array.h @@ -526,8 +526,8 @@ // do that because of bugs in gcc prior to 3.3. template <class T> -bool -cat_ra (Array<T>& ra_cat, const Array<T>& ra_arg, int dim, int add_dim); +int +cat_ra (Array<T>& ra, const Array<T>& ra_arg, int dim, int idx, int move); template <class LT, class RT> /* friend */ int @@ -564,9 +564,9 @@ template class Array<T>; \ template T resize_fill_value (const T&); \ -#define INSTANTIATE_CAT(T) \ - template bool cat_ra (Array<T>& ra_cat, const Array<T>& ra_arg, \ - int dim, int add_dim) +#define INSTANTIATE_ARRAY_CAT(T) \ + template int cat_ra (Array<T>& ra, const Array<T>& ra_arg, \ + int dim, int idx, int move) #define INSTANTIATE_ARRAY_AND_ASSIGN(T) \ INSTANTIATE_ARRAY (T); \