Mercurial > octave

changeset 20648:67cf25a6e11e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use gnulib::floor * idx-vector.cc (idx_vector::idx_range_rep::idx_range_rep): Use gnulib::floor.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Oct 2015 22:43:20 -0400
parents 98a730e0dd51
children 22296da09307
files liboctave/array/idx-vector.cc
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/idx-vector.cc	Fri Oct 23 07:30:22 2015 +0200
+++ b/liboctave/array/idx-vector.cc	Tue Oct 20 22:43:20 2015 -0400
@@ -144,18 +144,18 @@
               gripe_invalid_index (start);
               err = true;
             }
-          else if (step < 0 && start + (len-1)*step < 0)
+          else if (step < 0 && start + (len - 1)*step < 0)
             {
-              gripe_invalid_index (start + (len-1)*step);
+              gripe_invalid_index (start + (len - 1)*step);
               err = true;
             }
         }
       else
         {
           // find first non-integer, then gripe about it
-          double b = r.base();
-          double inc = r.inc();
-          gripe_invalid_index (b != floor(b) ? b : b+inc);
+          double b = r.base ();
+          double inc = r.inc ();
+          gripe_invalid_index (b != gnulib::floor (b) ? b : b + inc);
           err = true;
         }
     }