--- a/src/oct-obj.cc
+++ b/src/oct-obj.cc
@@ -33,9 +33,9 @@
 bool
 octave_value_list::valid_scalar_indices (void) const
 {
-  int n = length ();
+  octave_idx_type n = length ();
 
-  for (int i = 0; i < n; i++)
+  for (octave_idx_type i = 0; i < n; i++)
     if (! data[i].valid_as_scalar_index ())
       return false;
 
@@ -43,15 +43,15 @@
 }
 
 void
-octave_value_list::resize (int n, const octave_value& val)
+octave_value_list::resize (octave_idx_type n, const octave_value& val)
 {
-  int len = length ();
+  octave_idx_type len = length ();
 
   if (n > len)
     {
       data.resize (n);
 
-      for (int i = len; i < n; i++)
+      for (octave_idx_type i = len; i < n; i++)
 	data[i] = val;
     }
   else if (n < len)
@@ -61,7 +61,7 @@
 octave_value_list&
 octave_value_list::prepend (const octave_value& val)
 {
-  int n = length ();
+  octave_idx_type n = length ();
 
   resize (n + 1);
 
@@ -79,7 +79,7 @@
 octave_value_list&
 octave_value_list::append (const octave_value& val)
 {
-  int n = length ();
+  octave_idx_type n = length ();
 
   resize (n + 1);
 
@@ -91,12 +91,12 @@
 octave_value_list&
 octave_value_list::append (const octave_value_list& lst)
 {
-  int len = length ();
-  int lst_len = lst.length ();
+  octave_idx_type len = length ();
+  octave_idx_type lst_len = lst.length ();
 
   resize (len + lst_len);
 
-  for (int i = 0; i < lst_len; i++)
+  for (octave_idx_type i = 0; i < lst_len; i++)
     elem (len + i) = lst (i);
 
   return *this;
@@ -105,9 +105,9 @@
 octave_value_list&
 octave_value_list::reverse (void)
 {
-  int n = length ();
+  octave_idx_type n = length ();
 
-  for (int i = 0; i < n / 2; i++)
+  for (octave_idx_type i = 0; i < n / 2; i++)
     {
       octave_value tmp = elem (i);
       elem (i) = elem (n - i - 1);
@@ -118,12 +118,12 @@
 }
 
 octave_value_list
-octave_value_list::splice (int offset, int rep_length,
+octave_value_list::splice (octave_idx_type offset, octave_idx_type rep_length,
 			   const octave_value_list& lst) const
 { 
   octave_value_list retval;
 
-  int len = length ();
+  octave_idx_type len = length ();
 
   if (offset < 0 || offset >= len)
     {
@@ -140,21 +140,21 @@
       return retval;
     }
 
-  int lst_len = lst.length ();
+  octave_idx_type lst_len = lst.length ();
 
-  int new_len = len - rep_length + lst_len;
+  octave_idx_type new_len = len - rep_length + lst_len;
 
   retval.resize (new_len);
 
-  int k = 0;
+  octave_idx_type k = 0;
 
-  for (int i = 0; i < offset; i++)
+  for (octave_idx_type i = 0; i < offset; i++)
     retval(k++) = elem (i);
 
-  for (int i = 0; i < lst_len; i++)
+  for (octave_idx_type i = 0; i < lst_len; i++)
     retval(k++) = lst(i);
 
-  for (int i = offset + rep_length; i < len; i++)
+  for (octave_idx_type i = offset + rep_length; i < len; i++)
     retval(k++) = elem (i);
 
   return retval;
@@ -163,9 +163,9 @@
 bool
 octave_value_list::all_strings_p (void) const
 {
-  int n = length ();
+  octave_idx_type n = length ();
 
-  for (int i = 0; i < n; i++)
+  for (octave_idx_type i = 0; i < n; i++)
     if (! elem(i).is_string ())
       return 0;
 
@@ -179,16 +179,16 @@
 
   if (all_strings_p ())
     {
-      int len = length ();
+      octave_idx_type len = length ();
 
-      int total_nr = 0;
+      octave_idx_type total_nr = 0;
 
-      for (int i = 0; i < len; i++)
+      for (octave_idx_type i = 0; i < len; i++)
 	{
 	  // An empty std::string ("") has zero columns and zero rows (a
 	  // change that was made for Matlab contemptibility.
 
-	  int n = elem(i).rows ();
+	  octave_idx_type n = elem(i).rows ();
 
 	  total_nr += n ? n : 1;
 	}
@@ -197,10 +197,10 @@
 
       argv[0] = fcn_name;
 
-      int k = 1;
-      for (int i = 0; i < len; i++)
+      octave_idx_type k = 1;
+      for (octave_idx_type i = 0; i < len; i++)
 	{
-	  int nr = elem(i).rows ();
+	  octave_idx_type nr = elem(i).rows ();
 
 	  if (nr < 2)
 	    argv[k++] = elem(i).string_value ();
@@ -208,7 +208,7 @@
 	    {
 	      string_vector tmp = elem(i).all_strings ();
 
-	      for (int j = 0; j < nr; j++)
+	      for (octave_idx_type j = 0; j < nr; j++)
 		argv[k++] = tmp[j];
 	    }
 	}