Mercurial > octave
diff src/ov.h @ 4219:23d06c9e1edd
[project @ 2002-12-06 21:29:17 by jwe]
author | jwe |
---|---|
date | Fri, 06 Dec 2002 21:29:19 +0000 |
parents | 5719210fff4c |
children | ccfdb55c8156 |
line wrap: on
line diff
--- a/src/ov.h Thu Dec 05 04:43:20 2002 +0000 +++ b/src/ov.h Fri Dec 06 21:29:19 2002 +0000 @@ -31,6 +31,7 @@ #include <iostream> #include <string> +#include <list> #include "Range.h" #include "idx-vector.h" @@ -38,8 +39,6 @@ #include "oct-alloc.h" #include "str-vec.h" -#include "SLList.h" - class Cell; class Octave_map; class octave_stream; @@ -244,24 +243,24 @@ { return rep->try_narrowing_conversion (); } virtual octave_value subsref (const std::string type, - const SLList<octave_value_list>& idx) + const std::list<octave_value_list>& idx) { return rep->subsref (type, idx); } octave_value subsref (const std::string type, const octave_value_list& idx) { - SLList<octave_value_list> i; + std::list<octave_value_list> i; - i.append (idx); + i.push_back (idx); return rep->subsref (type, i); } virtual octave_value_list subsref (const std::string type, - const SLList<octave_value_list>& idx, + const std::list<octave_value_list>& idx, int nargout); octave_value next_subsref (const std::string type, const - SLList<octave_value_list>& idx, + std::list<octave_value_list>& idx, int skip = 1); virtual octave_value do_index_op (const octave_value_list& idx, @@ -275,11 +274,11 @@ do_multi_index_op (int nargout, const octave_value_list& idx); virtual octave_value subsasgn (const std::string type, - const SLList<octave_value_list>& idx, + const std::list<octave_value_list>& idx, const octave_value& rhs); octave_value assign (assign_op op, const std::string type, - const SLList<octave_value_list>& idx, + const std::list<octave_value_list>& idx, const octave_value& rhs); const octave_value& assign (assign_op, const octave_value& rhs); @@ -529,7 +528,7 @@ void do_non_const_unary_op (unary_op op, const octave_value_list& idx); octave_value do_non_const_unary_op (unary_op op, const std::string type, - const SLList<octave_value_list>& idx); + const std::list<octave_value_list>& idx); friend octave_value do_binary_op (binary_op op, const octave_value& a, @@ -547,7 +546,7 @@ // This should only be called for derived types. octave_value numeric_assign (const std::string type, - const SLList<octave_value_list>& idx, + const std::list<octave_value_list>& idx, const octave_value& rhs); void reset_indent_level (void) const