--- a/liboctave/Array-util.cc
+++ b/liboctave/Array-util.cc
@@ -29,7 +29,7 @@
 #include "lo-error.h"
 
 bool
-index_in_bounds (const Array<int>& ra_idx, const dim_vector& dimensions)
+index_in_bounds (const Array<octave_idx_type>& ra_idx, const dim_vector& dimensions)
 {
   bool retval = true;
 
@@ -53,7 +53,7 @@
 }
 
 void
-increment_index (Array<int>& ra_idx, const dim_vector& dimensions,
+increment_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions,
 		 int start_dimension)
 {
   ra_idx(start_dimension)++;
@@ -72,10 +72,10 @@
     }
 }
 
-int
-get_scalar_idx (Array<int>& idx, dim_vector& dims)
+octave_idx_type
+get_scalar_idx (Array<octave_idx_type>& idx, dim_vector& dims)
 {
-  int retval (-1);
+  octave_idx_type retval (-1);
 
   int n = idx.length ();
 
@@ -93,12 +93,12 @@
   return retval;
 }
 
-int
-num_ones (const Array<int>& ra_idx)
+octave_idx_type
+num_ones (const Array<octave_idx_type>& ra_idx)
 {
-  int retval = 0;
+  octave_idx_type retval = 0;
 
-  for (int i = 0; i < ra_idx.length (); i++)
+  for (octave_idx_type i = 0; i < ra_idx.length (); i++)
     {
       if (ra_idx (i) == 1)
 	retval++;
@@ -134,11 +134,11 @@
 }
 
 bool
-any_ones (const Array<int>& arr)
+any_ones (const Array<octave_idx_type>& arr)
 {
   bool retval = false;
 
-  for (int i = 0; i < arr.length (); i++)
+  for (octave_idx_type i = 0; i < arr.length (); i++)
     {
       if (arr (i) == 1)
 	{
@@ -150,10 +150,10 @@
   return retval;
 }
 
-int
-compute_index (const Array<int>& ra_idx, const dim_vector& dims)
+octave_idx_type
+compute_index (const Array<octave_idx_type>& ra_idx, const dim_vector& dims)
 {
-  int retval = -1;
+  octave_idx_type retval = -1;
 
   int n = dims.length ();
 
@@ -175,23 +175,23 @@
   return retval;
 }
 
-Array<int>
+Array<octave_idx_type>
 conv_to_int_array (const Array<idx_vector>& a)
 {
-  Array<int> retval (a.length ());
+  Array<octave_idx_type> retval (a.length ());
 
-  for (int i = 0; i < a.length (); i++)
+  for (octave_idx_type i = 0; i < a.length (); i++)
     retval (i) = a(i).elem (0);
 
   return retval;
 }
 
 Array<idx_vector>
-conv_to_array (const idx_vector *tmp, const int len)
+conv_to_array (const idx_vector *tmp, const octave_idx_type len)
 {
   Array<idx_vector> retval (len);
 
-  for (int i = 0; i < len; i++)
+  for (octave_idx_type i = 0; i < len; i++)
       retval (i) = tmp[i];
 
   return retval;
@@ -218,13 +218,13 @@
 }
 
 bool
-vector_equivalent (const Array<int>& ra_idx)
+vector_equivalent (const Array<octave_idx_type>& ra_idx)
 {
-  int n = ra_idx.length ();
+  octave_idx_type n = ra_idx.length ();
 
   bool found_first = false;
 
-  for (int i = 0; i < n; i++)
+  for (octave_idx_type i = 0; i < n; i++)
     {
       if (ra_idx(i) != 1)
         {
@@ -243,9 +243,9 @@
 {
   bool retval = true;
 
-  int n = ra_idx.length ();
+  octave_idx_type n = ra_idx.length ();
 
-  for (int i = 0; i < n; i++)
+  for (octave_idx_type i = 0; i < n; i++)
     {
       if (! ra_idx(i))
 	{
@@ -262,9 +262,9 @@
 {
   bool retval = false;
 
-  int n = ra_idx.length ();
+  octave_idx_type n = ra_idx.length ();
 
-  for (int i = 0; i < n; i++)
+  for (octave_idx_type i = 0; i < n; i++)
     {
       if (ra_idx(i).orig_empty ())
 	{
@@ -282,13 +282,13 @@
 {
   bool retval = true;
 
-  int idx_n = ra_idx.length ();
+  octave_idx_type idx_n = ra_idx.length ();
 
   int n = frozen_lengths.length ();
 
   assert (idx_n == n);
 
-  for (int i = 0; i < n; i++)
+  for (octave_idx_type i = 0; i < n; i++)
     {
       if (! ra_idx(i).is_colon_equiv (frozen_lengths(i)))
 	{
@@ -301,25 +301,25 @@
 }
 
 bool
-is_in (int num, const idx_vector& idx)
+is_in (octave_idx_type num, const idx_vector& idx)
 {
-  int n = idx.capacity ();
+  octave_idx_type n = idx.capacity ();
 
-  for (int i = 0; i < n; i++)
+  for (octave_idx_type i = 0; i < n; i++)
     if (idx.elem (i) == num)
       return true;
 
   return false;
 }
 
-int
-how_many_lgt (const int num, idx_vector& idxv)
+octave_idx_type
+how_many_lgt (const octave_idx_type num, idx_vector& idxv)
 {
-  int retval = 0;
+  octave_idx_type retval = 0;
 
-  int n = idxv.capacity ();
+  octave_idx_type n = idxv.capacity ();
 
-  for (int i = 0; i < n; i++)
+  for (octave_idx_type i = 0; i < n; i++)
     {
       if (num > idxv.elem (i))
 	retval++;
@@ -329,11 +329,11 @@
 }
 
 bool
-all_ones (const Array<int>& arr)
+all_ones (const Array<octave_idx_type>& arr)
 {
   bool retval = true;
 
-  for (int i = 0; i < arr.length (); i++)
+  for (octave_idx_type i = 0; i < arr.length (); i++)
     {
       if (arr(i) != 1)
 	{
@@ -345,23 +345,23 @@
   return retval;
 }
 
-Array<int>
-get_elt_idx (const Array<idx_vector>& ra_idx, const Array<int>& result_idx)
+Array<octave_idx_type>
+get_elt_idx (const Array<idx_vector>& ra_idx, const Array<octave_idx_type>& result_idx)
 {
-  int n = ra_idx.length ();
+  octave_idx_type n = ra_idx.length ();
 
-  Array<int> retval (n);
+  Array<octave_idx_type> retval (n);
 
-  for (int i = 0; i < n; i++)
+  for (octave_idx_type i = 0; i < n; i++)
     retval(i) = ra_idx(i).elem (result_idx(i));
 
   return retval;
 }
 
-Array<int>
-get_ra_idx (int idx, const dim_vector& dims)
+Array<octave_idx_type>
+get_ra_idx (octave_idx_type idx, const dim_vector& dims)
 {
-  Array<int> retval;
+  Array<octave_idx_type> retval;
 
   int n_dims = dims.length ();
 
@@ -372,14 +372,14 @@
 
   assert (idx > 0 || idx < dims.numel ());
 
-  for (int i = 0; i < idx; i++)
+  for (octave_idx_type i = 0; i < idx; i++)
     increment_index (retval, dims);
 
   // XXX FIXME XXX -- the solution using increment_index is not
   // efficient.
 
 #if 0
-  int var = 1;
+  octave_idx_type var = 1;
   for (int i = 0; i < n_dims; i++)
     {
       std::cout << "idx: " << idx << ", var: " << var << ", dims(" << i << "): " << dims(i) <<"\n";
@@ -424,8 +424,8 @@
 	}
       else
 	{
-	  int last_ra_idx = ra_idx(n-1)(0);
-	  for (int i = 1; i < ra_idx (n - 1).capacity (); i++)
+	  octave_idx_type last_ra_idx = ra_idx(n-1)(0);
+	  for (octave_idx_type i = 1; i < ra_idx (n - 1).capacity (); i++)
 	    last_ra_idx = (last_ra_idx > ra_idx(n-1)(i) ? last_ra_idx : 
 			   ra_idx(n-1)(i));
 
@@ -450,15 +450,15 @@
   return retval;
 }
 
-Array<int>
-calc_permutated_idx (const Array<int>& old_idx, 
-		     const Array<int>& perm_vec, bool inv)
+Array<octave_idx_type>
+calc_permutated_idx (const Array<octave_idx_type>& old_idx, 
+		     const Array<octave_idx_type>& perm_vec, bool inv)
 {
-  int n_el = old_idx.length ();
+  octave_idx_type n_el = old_idx.length ();
 
-  Array<int> retval (n_el);
+  Array<octave_idx_type> retval (n_el);
 
-  for (int i = 0; i < n_el; i++)
+  for (octave_idx_type i = 0; i < n_el; i++)
     {
       if (inv)
 	retval(perm_vec(i)) = old_idx(i);