Mercurial > hg > octave-lyh
diff liboctave/Array-i.cc @ 8721:e9cb742df9eb
imported patch sort3.diff
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Wed, 11 Feb 2009 15:25:53 +0100 |
| parents | 314be237cd5b |
| children | eb63fbe60fab |
line wrap: on
line diff
--- a/liboctave/Array-i.cc +++ b/liboctave/Array-i.cc @@ -42,34 +42,31 @@ INSTANTIATE_ARRAY_SORT (long long); #endif -INSTANTIATE_ARRAY_AND_ASSIGN (int, OCTAVE_API); -INSTANTIATE_ARRAY_AND_ASSIGN (long, OCTAVE_API); +INSTANTIATE_ARRAY (int, OCTAVE_API); +INSTANTIATE_ARRAY (long, OCTAVE_API); #if defined (HAVE_LONG_LONG_INT) -INSTANTIATE_ARRAY_AND_ASSIGN (long long, OCTAVE_API); +INSTANTIATE_ARRAY (long long, OCTAVE_API); #endif -INSTANTIATE_ARRAY_ASSIGN (int, short, OCTAVE_API) -INSTANTIATE_ARRAY_ASSIGN (int, char, OCTAVE_API) - INSTANTIATE_ARRAY_SORT (octave_int8); INSTANTIATE_ARRAY_SORT (octave_int16); INSTANTIATE_ARRAY_SORT (octave_int32); INSTANTIATE_ARRAY_SORT (octave_int64); -INSTANTIATE_ARRAY_AND_ASSIGN (octave_int8, OCTAVE_API); -INSTANTIATE_ARRAY_AND_ASSIGN (octave_int16, OCTAVE_API); -INSTANTIATE_ARRAY_AND_ASSIGN (octave_int32, OCTAVE_API); -INSTANTIATE_ARRAY_AND_ASSIGN (octave_int64, OCTAVE_API); +INSTANTIATE_ARRAY (octave_int8, OCTAVE_API); +INSTANTIATE_ARRAY (octave_int16, OCTAVE_API); +INSTANTIATE_ARRAY (octave_int32, OCTAVE_API); +INSTANTIATE_ARRAY (octave_int64, OCTAVE_API); INSTANTIATE_ARRAY_SORT (octave_uint8); INSTANTIATE_ARRAY_SORT (octave_uint16); INSTANTIATE_ARRAY_SORT (octave_uint32); INSTANTIATE_ARRAY_SORT (octave_uint64); -INSTANTIATE_ARRAY_AND_ASSIGN (octave_uint8, OCTAVE_API); -INSTANTIATE_ARRAY_AND_ASSIGN (octave_uint16, OCTAVE_API); -INSTANTIATE_ARRAY_AND_ASSIGN (octave_uint32, OCTAVE_API); -INSTANTIATE_ARRAY_AND_ASSIGN (octave_uint64, OCTAVE_API); +INSTANTIATE_ARRAY (octave_uint8, OCTAVE_API); +INSTANTIATE_ARRAY (octave_uint16, OCTAVE_API); +INSTANTIATE_ARRAY (octave_uint32, OCTAVE_API); +INSTANTIATE_ARRAY (octave_uint64, OCTAVE_API); #include "Array2.h"