Mercurial > mxe-octave

comparison src/of-sparsersb-1-deprecated.patch @ 5185:ba61e5f8161e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/of-sparsersb-1-deprecated.patch: Update patch for Octave 6.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 15 Oct 2019 18:55:54 +0200
parents 8c1d507a7b77
children
comparison
equal deleted inserted replaced
5184:c021b4c0a32c 5185:ba61e5f8161e
1 diff -r df6951233012 src/sparsersb.cc 1 diff -r df6951233012 src/sparsersb.cc
2 --- a/src/sparsersb.cc Fri Jun 22 23:28:18 2018 +0200 2 --- a/src/sparsersb.cc Fri Jun 22 23:28:18 2018 +0200
3 +++ b/src/sparsersb.cc Sun Jan 20 22:15:20 2019 +0100 3 +++ b/src/sparsersb.cc Mon Oct 14 21:46:55 2019 +0200
4 @@ -68,6 +68,7 @@ 4 @@ -68,6 +68,7 @@
5 5
6 #define RSBOI_WANT_PRINT_PCT_OCTAVE_STYLE 1 6 #define RSBOI_WANT_PRINT_PCT_OCTAVE_STYLE 1
7 7
8 +#include <octave/interpreter.h> 8 +#include <octave/interpreter.h>
16 - bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt) 16 - bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt)
17 + bool load_binary (std::istream& is, bool swap, octave::mach_info::float_format fmt) 17 + bool load_binary (std::istream& is, bool swap, octave::mach_info::float_format fmt)
18 { 18 {
19 error("load_binary() " RSBOI_0_NIYERRMSG); 19 error("load_binary() " RSBOI_0_NIYERRMSG);
20 return false; 20 return false;
21 @@ -1777,8 +1778,8 @@
22 RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG);
23 RSBOI_DESTROY(v1.mtxAp);
24 octave_value retval;
25 - //v1.assign(idx, v2.matrix_value());
26 - v1 = (idx, v2.matrix_value());
27 + v1.assign(idx, v2.sparse_matrix_value ());
28 + //v1 = (idx, v2.matrix_value());
29 //retval = v1;
30 retval = v2.matrix_value();
31 RSBOI_WARN(RSBOI_O_MISSIMPERRMSG);
21 @@ -1985,95 +1986,95 @@ 32 @@ -1985,95 +1986,95 @@
22 // deprecated; need a wrapper using octave::typeinfo::register_unary_op 33 // deprecated; need a wrapper using octave::typeinfo::register_unary_op
23 #define RSBOI_INSTALL_UNOP INSTALL_UNOP 34 #define RSBOI_INSTALL_UNOP INSTALL_UNOP
24 35
25 -static void install_sparsersb_ops (void) 36 -static void install_sparsersb_ops (void)