Mercurial > octave-nkf

changeset 19323:cd8cf41f130d gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to gui-release.
author Rik <rik@octave.org>
date Tue, 28 Oct 2014 12:06:52 -0700
parents 0e077a29854f (current diff) d60b44acfff7 (diff)
children 93a33123fcfe ad2bb7315b41
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/Range.h	Tue Oct 28 13:57:26 2014 -0400
+++ b/liboctave/array/Range.h	Tue Oct 28 12:06:52 2014 -0700
@@ -54,7 +54,7 @@
     : rng_base (b), rng_limit (b + (n-1) * i), rng_inc (i),
       rng_nelem (n), cache ()
   {
-    if (! xfinite (b) || ! xfinite (i) | ! xfinite (rng_limit))
+    if (! xfinite (b) || ! xfinite (i) || ! xfinite (rng_limit))
       rng_nelem = -2;
   }