Mercurial > hg > octave-lyh
comparison 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 |
comparison
equal
deleted
inserted
replaced
4805:b0d6da24caeb | 4806:d3bd9c04147f |
---|---|
524 // NOTE: these functions should be friends of the Array<T> class and | 524 // NOTE: these functions should be friends of the Array<T> class and |
525 // Array<T>::dimensions should be protected, not public, but we can't | 525 // Array<T>::dimensions should be protected, not public, but we can't |
526 // do that because of bugs in gcc prior to 3.3. | 526 // do that because of bugs in gcc prior to 3.3. |
527 | 527 |
528 template <class T> | 528 template <class T> |
529 bool | 529 int |
530 cat_ra (Array<T>& ra_cat, const Array<T>& ra_arg, int dim, int add_dim); | 530 cat_ra (Array<T>& ra, const Array<T>& ra_arg, int dim, int idx, int move); |
531 | 531 |
532 template <class LT, class RT> | 532 template <class LT, class RT> |
533 /* friend */ int | 533 /* friend */ int |
534 assign (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv); | 534 assign (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv); |
535 | 535 |
562 | 562 |
563 #define INSTANTIATE_ARRAY(T) \ | 563 #define INSTANTIATE_ARRAY(T) \ |
564 template class Array<T>; \ | 564 template class Array<T>; \ |
565 template T resize_fill_value (const T&); \ | 565 template T resize_fill_value (const T&); \ |
566 | 566 |
567 #define INSTANTIATE_CAT(T) \ | 567 #define INSTANTIATE_ARRAY_CAT(T) \ |
568 template bool cat_ra (Array<T>& ra_cat, const Array<T>& ra_arg, \ | 568 template int cat_ra (Array<T>& ra, const Array<T>& ra_arg, \ |
569 int dim, int add_dim) | 569 int dim, int idx, int move) |
570 | 570 |
571 #define INSTANTIATE_ARRAY_AND_ASSIGN(T) \ | 571 #define INSTANTIATE_ARRAY_AND_ASSIGN(T) \ |
572 INSTANTIATE_ARRAY (T); \ | 572 INSTANTIATE_ARRAY (T); \ |
573 INSTANTIATE_ARRAY_ASSIGN (T, T) | 573 INSTANTIATE_ARRAY_ASSIGN (T, T) |
574 | 574 |