Mercurial > octave

diff src/DLD-FUNCTIONS/sub2ind.cc @ 10258:e317791645c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
64-bit fixes
author John W. Eaton <jwe@octave.org>
date Wed, 03 Feb 2010 15:27:53 -0500
parents a531dec450c4
children 12884915a8e4
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/sub2ind.cc	Wed Feb 03 06:34:29 2010 -0500
+++ b/src/DLD-FUNCTIONS/sub2ind.cc	Wed Feb 03 15:27:53 2010 -0500
@@ -33,8 +33,7 @@
 
 
 static dim_vector 
-get_dim_vector (const octave_value& val,
-                const char *name)
+get_dim_vector (const octave_value& val, const char *name)
 {
   RowVector dimsv = val.row_vector_value (false, true);
   dim_vector dv;
@@ -44,11 +43,11 @@
     error ("%s: dimension vector must not be empty", name);
   else
     {
-      dv.resize (std::max (n, 2));
+      dv.resize (std::max (n, static_cast<octave_idx_type> (2)));
       dv(1) = 1;
       for (octave_idx_type i = 0; i < n; i++)
         {
-          octave_idx_type ii = static_cast<int> (dimsv(i));
+          octave_idx_type ii = dimsv(i);
           if (ii == dimsv(i) && ii >= 0)
             dv(i) = ii;
           else