Mercurial > octave-nkf
diff src/DLD-FUNCTIONS/sort.cc @ 4998:3f3d6eec0a2c
[project @ 2004-09-15 21:00:01 by jwe]
| author | jwe |
|---|---|
| date | Wed, 15 Sep 2004 21:00:13 +0000 |
| parents | d117a9fb83be |
| children | 5538e4ceb616 |
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/sort.cc Wed Sep 15 20:49:35 2004 +0000 +++ b/src/DLD-FUNCTIONS/sort.cc Wed Sep 15 21:00:13 2004 +0000 @@ -1,4 +1,4 @@ -/* +v/* Copyright (C) 1996, 1997 John W. Eaton Copyright (C) 2004 David Bateman @@ -50,10 +50,10 @@ }; template <class T> -static octave_value_list +static octave_value mx_sort (ArrayN<T> &m, int dim, sortmode mode = UNDEFINED) { - octave_value_list retval; + octave_value retval; if (m.length () < 1) return retval; @@ -105,7 +105,7 @@ } } - retval(0) = octave_value (m); + retval = m; return retval; } @@ -219,7 +219,7 @@ bool ascending_compare (unsigned EIGHT_BYTE_INT a, - unsigned EIGHT_BYTE_INT b) + unsigned EIGHT_BYTE_INT b) { return (a < b); } @@ -250,10 +250,10 @@ template class octave_sort<vec_index<unsigned EIGHT_BYTE_INT> *>; template <> -static octave_value_list +static octave_value mx_sort (ArrayN<double> &m, int dim, sortmode mode) { - octave_value_list retval; + octave_value retval; if (m.length () < 1) return retval; @@ -362,7 +362,8 @@ } } - retval(0) = m; + retval = m; + return retval; } @@ -459,6 +460,7 @@ retval(1) = idx; retval(0) = m; + return retval; }