diff src/ov.cc @ 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.cc
+++ b/src/ov.cc
@@ -568,7 +568,7 @@
 
 octave_value_list
 octave_value::subsref (const std::string type,
-		       const SLList<octave_value_list>& idx, int nargout)
+		       const std::list<octave_value_list>& idx, int nargout)
 {
   if (is_constant ())
     return rep->subsref (type, idx);
@@ -578,16 +578,16 @@
 
 octave_value
 octave_value::next_subsref (const std::string type,
-			    const SLList<octave_value_list>& idx,
+			    const std::list<octave_value_list>& idx,
 			    int skip) 
 {
   assert (skip > 0);
 
-  if (idx.length () > skip)
+  if (idx.size () > skip)
     {
-      SLList<octave_value_list> new_idx (idx);
+      std::list<octave_value_list> new_idx (idx);
       for (int i = 0; i < skip; i++)
-	new_idx.remove_front ();
+	new_idx.erase (new_idx.begin ());
       return subsref (type.substr (skip), new_idx);
     }
   else
@@ -629,7 +629,7 @@
 
 octave_value
 octave_value::subsasgn (const std::string type,
-			const SLList<octave_value_list>& idx,
+			const std::list<octave_value_list>& idx,
 			const octave_value& rhs)
 {
   return rep->subsasgn (type, idx, rhs);
@@ -637,7 +637,7 @@
 
 octave_value
 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)
 {
   octave_value retval;
@@ -1080,7 +1080,7 @@
 
 octave_value
 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)
 {
   octave_value retval;
@@ -1433,7 +1433,7 @@
 
 octave_value
 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)
 {
   octave_value retval;