Mercurial > hg > octave-nkf
changeset 19411:3978a5509f40 gui-release
maint: Periodic merge of stable to gui-release.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 05 Oct 2014 10:46:48 -0400 |
parents | 4b6f87c6739f (current diff) 0279c601b49c (diff) |
children | 6443693a176f 85b2d669c21e |
files | libinterp/parse-tree/pt-eval.cc |
diffstat | 3 files changed, 4 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/ls-hdf5.h +++ b/libinterp/corefcn/ls-hdf5.h @@ -204,7 +204,7 @@ const char *attr_name, void *buf); #ifdef USE_64_BIT_IDX_T -#define H5T_NATIVE_IDX H5T_NATIVE_LONG +#define H5T_NATIVE_IDX H5T_NATIVE_INT64 #else #define H5T_NATIVE_IDX H5T_NATIVE_INT #endif
--- a/libinterp/corefcn/urlwrite.cc +++ b/libinterp/corefcn/urlwrite.cc @@ -299,7 +299,7 @@ \n\ @example\n\ @group\n\ -urlwrite (\"ftp://ftp.octave.org/pub/octave/README\",\n\ +urlwrite (\"ftp://ftp.octave.org/pub/README\",\n\ \"README.txt\");\n\ @end group\n\ @end example\n\ @@ -462,7 +462,7 @@ in string @var{s}. For example:\n\ \n\ @example\n\ -s = urlread (\"ftp://ftp.octave.org/pub/octave/README\");\n\ +s = urlread (\"ftp://ftp.octave.org/pub/README\");\n\ @end example\n\ \n\ The variable @var{success} is 1 if the download was successful,\n\
--- a/libinterp/parse-tree/pt-eval.cc +++ b/libinterp/parse-tree/pt-eval.cc @@ -336,21 +336,10 @@ Range rng = rhs.range_value (); octave_idx_type steps = rng.nelem (); - double b = rng.base (); - double increment = rng.inc (); for (octave_idx_type i = 0; i < steps; i++) { - // Use multiplication here rather than declaring a - // temporary variable outside the loop and using - // - // tmp_val += increment - // - // to avoid problems with limited precision. Also, this - // is consistent with the way Range::matrix_value is - // implemented. - - octave_value val (b + i * increment); + octave_value val (rng.elem (i)); ult.assign (octave_value::op_asn_eq, val);