Mercurial > mxe-octave
annotate src/stable-octave-3-fixes.patch @ 3948:1fea617cdf13
of-odepkg: update to v0.8.5
* src/of-odepkg.mk: update version, checksum, compile if binary package
* build_packages.m: add odepkg back to install script
* Makefile.am: add of-odepkg back to installed of packages
author | John Donoghue |
---|---|
date | Thu, 21 May 2015 13:51:16 -0400 |
parents | 992be3109433 |
children |
rev | line source |
---|---|
3718
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1 # HG changeset patch |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2 # User John W. Eaton <jwe@octave.org> |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
3 # Date 1412519047 14400 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
4 # Sun Oct 05 10:24:07 2014 -0400 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
5 # Branch stable |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 # Node ID 3ffb8f53e94019084321d065390f4d4e215fd465 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
7 # Parent 432ffa35de136a5dfd2a717a598750b62e6944f9 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
8 use correct HDF5 size for octave_idx_type on Windows-64 (bug #43101) |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
9 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
10 * ls-hdf5.h: Define H5T_NATIVE_IDX to H5T_NATIVE_INT64 when using |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
11 64-bit indexing. |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
12 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 diff --git a/libinterp/corefcn/ls-hdf5.h b/libinterp/corefcn/ls-hdf5.h |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 --- a/libinterp/corefcn/ls-hdf5.h |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 +++ b/libinterp/corefcn/ls-hdf5.h |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 @@ -204,7 +204,7 @@ |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 const char *attr_name, void *buf); |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 #ifdef USE_64_BIT_IDX_T |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
20 -#define H5T_NATIVE_IDX H5T_NATIVE_LONG |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 +#define H5T_NATIVE_IDX H5T_NATIVE_INT64 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
22 #else |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 #define H5T_NATIVE_IDX H5T_NATIVE_INT |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 #endif |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 # HG changeset patch |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 # User John W. Eaton <jwe@octave.org> |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 # Date 1412520111 14400 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 # Sun Oct 05 10:41:51 2014 -0400 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 # Branch stable |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
30 # Node ID 0279c601b49ce5d539b1ae938e8ec562b63f1ced |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
31 # Parent 3ffb8f53e94019084321d065390f4d4e215fd465 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 compute for loop indices consistently with range element results |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 * pt-eval.cc (tree_evaluator::visit_simple_for_command): Use |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 Range::elem instead of compuiting elements directly. This change |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 appears to fix obscure test failures in eig.cc-tst on 64-bit Windows |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
37 systems. See also task #13313. |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
38 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 diff --git a/libinterp/parse-tree/pt-eval.cc b/libinterp/parse-tree/pt-eval.cc |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
40 --- a/libinterp/parse-tree/pt-eval.cc |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
41 +++ b/libinterp/parse-tree/pt-eval.cc |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
42 @@ -336,21 +336,10 @@ |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
43 Range rng = rhs.range_value (); |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
44 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
45 octave_idx_type steps = rng.nelem (); |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
46 - double b = rng.base (); |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
47 - double increment = rng.inc (); |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
48 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
49 for (octave_idx_type i = 0; i < steps; i++) |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
50 { |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
51 - // Use multiplication here rather than declaring a |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
52 - // temporary variable outside the loop and using |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
53 - // |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
54 - // tmp_val += increment |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
55 - // |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
56 - // to avoid problems with limited precision. Also, this |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
57 - // is consistent with the way Range::matrix_value is |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
58 - // implemented. |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
59 - |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
60 - octave_value val (b + i * increment); |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
61 + octave_value val (rng.elem (i)); |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
62 |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
63 ult.assign (octave_value::op_asn_eq, val); |
992be3109433
new patch for stable-octave package
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
64 |