[Pkg-octave-commit] [octave-odepkg] 02/02: d/p/remove-octave-map.patch: New patch
Rafael Laboissière
rlaboiss-guest at moszumanska.debian.org
Fri May 1 21:21:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
rlaboiss-guest pushed a commit to branch master
in repository octave-odepkg.
commit c92ccb04529cbeddff284b610ff581bd662d675d
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date: Fri May 1 18:13:48 2015 -0300
d/p/remove-octave-map.patch: New patch
---
debian/patches/remove-octave-map.patch | 511 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 512 insertions(+)
diff --git a/debian/patches/remove-octave-map.patch b/debian/patches/remove-octave-map.patch
new file mode 100644
index 0000000..bececbb
--- /dev/null
+++ b/debian/patches/remove-octave-map.patch
@@ -0,0 +1,511 @@
+Description: Remove use of deprecated Octave_map
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Origin: upstream, http://sf.net/p/octave/odepkg/ci/{35899c1,2fc773c,93bbfe2}
+Forwarded: not-needed
+Last-Update: 2015-05-01
+
+diff -r dbbc8764a7dd -r 93bbfe2110b3 src/odepkg_auxiliary_functions.cc
+--- a/src/odepkg_auxiliary_functions.cc Tue Jan 07 15:06:58 2014 +0000
++++ b/src/odepkg_auxiliary_functions.cc Sun Mar 02 20:18:07 2014 +0100
+@@ -25,9 +25,9 @@
+ /* -*- texinfo -*-
+ * @subsection Source file @file{odepkg_auxiliary_functions.cc}
+ *
+- * @deftypefn {Function} octave_value odepkg_auxiliary_getmapvalue (std::string vnam, Octave_map vmap)
++ * @deftypefn {Function} octave_value odepkg_auxiliary_getmapvalue (std::string vnam, octave_scalar_map vmap)
+ *
+- * Return the @code{octave_value} from the field that is identified by the string @var{vnam} of the @code{Octave_map} that is given by @var{vmap}. The input arguments of this function are
++ * Return the @code{octave_value} from the field that is identified by the string @var{vnam} of the @code{octave_scalar_map} that is given by @var{vmap}. The input arguments of this function are
+ *
+ * @itemize @minus
+ * @item @var{vnam}: The name of the field whose value is returned
+@@ -35,10 +35,10 @@
+ * @end itemize
+ * @end deftypefn
+ */
+-octave_value odepkg_auxiliary_getmapvalue (std::string vnam, Octave_map vmap) {
+- Octave_map::const_iterator viter;
++octave_value odepkg_auxiliary_getmapvalue (std::string vnam, octave_scalar_map vmap) {
++ octave_map::const_iterator viter;
+ viter = vmap.seek (vnam);
+- return (vmap.contents(viter)(0));
++ return (vmap.contents(viter));
+ }
+
+ /* -*- texinfo -*-
+@@ -371,7 +371,7 @@
+ octave_value odepkg_auxiliary_makestats
+ (octave_value_list vstats, octave_idx_type vprnt) {
+
+- Octave_map vretval;
++ octave_scalar_map vretval;
+
+ if (vstats.length () < 5)
+ error_with_id ("OdePkg:InvalidArgument",
+diff -r dbbc8764a7dd -r 93bbfe2110b3 src/odepkg_auxiliary_functions.h
+--- a/src/odepkg_auxiliary_functions.h Tue Jan 07 15:06:58 2014 +0000
++++ b/src/odepkg_auxiliary_functions.h Sun Mar 02 20:18:07 2014 +0100
+@@ -20,7 +20,7 @@
+ #define odepkg_auxiliary_functions_h 1
+
+ octave_value odepkg_auxiliary_getmapvalue
+- (std::string vnam, Octave_map vmap);
++ (std::string vnam, octave_scalar_map vmap);
+
+ octave_idx_type odepkg_auxiliary_isvector
+ (octave_value vval);
+diff -r dbbc8764a7dd -r 93bbfe2110b3 src/odepkg_octsolver_ddaskr.cc
+--- a/src/odepkg_octsolver_ddaskr.cc Tue Jan 07 15:06:58 2014 +0000
++++ b/src/odepkg_octsolver_ddaskr.cc Sun Mar 02 20:18:07 2014 +0100
+@@ -228,7 +228,7 @@
+
+ octave_idx_type nargin = args.length (); // The number of input arguments
+ octave_value_list vretval; // The cell array of return args
+- Octave_map vodeopt; // The OdePkg options structure
++ octave_scalar_map vodeopt; // The OdePkg options structure
+
+ // Check number and types of all the input arguments
+ if (nargin < 4) {
+@@ -286,7 +286,7 @@
+ // Fifth input argument != OdePkg option, need a default structure
+ if (!args(4).is_map ()) {
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ for (octave_idx_type vcnt = 4; vcnt < nargin; vcnt++)
+ vddaskrextarg(vcnt-4) = args(vcnt); // Save arguments in vddaskrextarg
+ }
+@@ -297,7 +297,7 @@
+ varin(0) = args(4); varin(1) = "odekdi";
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create structure of args(4)
++ vodeopt = tmp(0).scalar_map_value (); // Create structure of args(4)
+ for (octave_idx_type vcnt = 5; vcnt < nargin; vcnt++)
+ vddaskrextarg(vcnt-5) = args(vcnt); // Save extra arguments
+ }
+@@ -308,14 +308,14 @@
+ varin(0) = args(4); varin(1) = "odekdi"; // Check structure
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ } // if (nargin >= 5)
+
+ else { // if nargin == 4, everything else has been checked before
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ /* Start PREPROCESSING, ie. check which options have been set and
+@@ -667,7 +667,7 @@
+ octave_value vtres, vyres;
+ odepkg_auxiliary_solstore (vtres, vyres, 2);
+
+- // Get the stats information as an Octave_map if the option 'Stats'
++ // Get the stats information as an octave_scalar_map if the option 'Stats'
+ // has been set with odeset
+ // "nsteps", "nfailed", "nfevals", "npds", "ndecomps", "nlinsols"
+ octave_value_list vstatinput;
+@@ -686,7 +686,7 @@
+ // Set up output arguments that depend on how many output arguments
+ // are desired -- check the nargout variable
+ if (nargout == 1) {
+- Octave_map vretmap;
++ octave_scalar_map vretmap;
+ vretmap.assign ("x", vtres);
+ vretmap.assign ("y", vyres);
+ vretmap.assign ("solver", "odekdi");
+diff -r dbbc8764a7dd -r 93bbfe2110b3 src/odepkg_octsolver_mebdfdae.cc
+--- a/src/odepkg_octsolver_mebdfdae.cc Tue Jan 07 15:06:58 2014 +0000
++++ b/src/odepkg_octsolver_mebdfdae.cc Sun Mar 02 20:18:07 2014 +0100
+@@ -274,7 +274,7 @@
+
+ octave_idx_type nargin = args.length (); // The number of input arguments
+ octave_value_list vretval; // The cell array of return args
+- Octave_map vodeopt; // The OdePkg options structure
++ octave_scalar_map vodeopt; // The OdePkg options structure
+
+ // Check number and types of all the input arguments
+ if (nargin < 3) {
+@@ -316,7 +316,7 @@
+ // Fourth input argument != OdePkg option, need a default structure
+ if (!args(3).is_map ()) {
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ for (octave_idx_type vcnt = 3; vcnt < nargin; vcnt++)
+ vmebdfdaeextarg(vcnt-3) = args(vcnt); // Save arguments in vmebdfdaeextarg
+ }
+@@ -327,7 +327,7 @@
+ varin(0) = args(3); varin(1) = "odebda";
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create structure from args(4)
++ vodeopt = tmp(0).scalar_map_value (); // Create structure from args(4)
+ for (octave_idx_type vcnt = 4; vcnt < nargin; vcnt++)
+ vmebdfdaeextarg(vcnt-4) = args(vcnt); // Save extra arguments
+ }
+@@ -338,14 +338,14 @@
+ varin(0) = args(3); varin(1) = "odebda"; // Check structure
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ } // if (nargin >= 4)
+
+ else { // if nargin == 3, everything else has been checked before
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ /* Start PREPROCESSING, ie. check which options have been set and
+@@ -733,7 +733,7 @@
+ odepkg_auxiliary_solstore (vtres, vyres, 2);
+ // odepkg_auxiliary_solstore (vtres, vyres, voutsel, 100);
+
+- // Get the stats information as an Octave_map if the option 'Stats'
++ // Get the stats information as an octave_scalar_map if the option 'Stats'
+ // has been set with odeset
+ // "nsteps", "nfailed", "nfevals", "npds", "ndecomps", "nlinsols"
+ octave_value_list vstatinput;
+@@ -752,7 +752,7 @@
+ // Set up output arguments that depends on how many output arguments
+ // are desired by the caller
+ if (nargout == 1) {
+- Octave_map vretmap;
++ octave_scalar_map vretmap;
+ vretmap.assign ("x", vtres);
+ vretmap.assign ("y", vyres);
+ vretmap.assign ("solver", "odebda");
+diff -r dbbc8764a7dd -r 93bbfe2110b3 src/odepkg_octsolver_mebdfi.cc
+--- a/src/odepkg_octsolver_mebdfi.cc Tue Jan 07 15:06:58 2014 +0000
++++ b/src/odepkg_octsolver_mebdfi.cc Sun Mar 02 20:18:07 2014 +0100
+@@ -350,7 +350,7 @@
+
+ octave_idx_type nargin = args.length (); // The number of input arguments
+ octave_value_list vretval; // The cell array of return args
+- Octave_map vodeopt; // The OdePkg options structure
++ octave_scalar_map vodeopt; // The OdePkg options structure
+
+ // Check number and types of all the input arguments
+ if (nargin < 4) {
+@@ -408,7 +408,7 @@
+ // Fifth input argument != OdePkg option, need a default structure
+ if (!args(4).is_map ()) {
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ for (octave_idx_type vcnt = 4; vcnt < nargin; vcnt++)
+ vmebdfiextarg(vcnt-4) = args(vcnt); // Save arguments in vmebdfiextarg
+ }
+@@ -419,7 +419,7 @@
+ varin(0) = args(4); varin(1) = "odebdi";
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create structure of args(4)
++ vodeopt = tmp(0).scalar_map_value (); // Create structure of args(4)
+ for (octave_idx_type vcnt = 5; vcnt < nargin; vcnt++)
+ vmebdfiextarg(vcnt-5) = args(vcnt); // Save extra arguments
+ }
+@@ -430,14 +430,14 @@
+ varin(0) = args(4); varin(1) = "odebdi"; // Check structure
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ } // if (nargin >= 5)
+
+ else { // if nargin == 4, everything else has been checked before
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ /* Start PREPROCESSING, ie. check which options have been set and
+@@ -838,7 +838,7 @@
+ odepkg_auxiliary_solstore (vtres, vyres, 2);
+ // odepkg_auxiliary_solstore (vtres, vyres, voutsel, 100);
+
+- // Get the stats information as an Octave_map if the option 'Stats'
++ // Get the stats information as an octave_scalar_map if the option 'Stats'
+ // has been set with odeset
+ octave_value_list vstatinput;
+ vstatinput(0) = IWORK[4];
+@@ -857,7 +857,7 @@
+ // Set up output arguments that depends on how many output arguments
+ // are desired by the caller
+ if (nargout == 1) {
+- Octave_map vretmap;
++ octave_scalar_map vretmap;
+ vretmap.assign ("x", vtres);
+ vretmap.assign ("y", vyres);
+ vretmap.assign ("solver", "odebdi");
+diff -r dbbc8764a7dd -r 93bbfe2110b3 src/odepkg_octsolver_radau.cc
+--- a/src/odepkg_octsolver_radau.cc Tue Jan 07 15:06:58 2014 +0000
++++ b/src/odepkg_octsolver_radau.cc Sun Mar 02 20:18:07 2014 +0100
+@@ -277,7 +277,7 @@
+
+ octave_idx_type nargin = args.length (); // The number of input arguments
+ octave_value_list vretval; // The cell array of return args
+- Octave_map vodeopt; // The OdePkg options structure
++ octave_scalar_map vodeopt; // The OdePkg options structure
+
+ // Check number and types of all input arguments
+ if (nargin < 3) {
+@@ -319,7 +319,7 @@
+ // Fourth input argument != OdePkg option, need a default structure
+ if (!args(3).is_map ()) {
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ for (octave_idx_type vcnt = 3; vcnt < nargin; vcnt++)
+ vradauextarg(vcnt-3) = args(vcnt); // Save arguments in vradauextarg
+ }
+@@ -330,7 +330,7 @@
+ varin(0) = args(3); varin(1) = "ode2r";
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create structure from args(4)
++ vodeopt = tmp(0).scalar_map_value (); // Create structure from args(4)
+ for (octave_idx_type vcnt = 4; vcnt < nargin; vcnt++)
+ vradauextarg(vcnt-4) = args(vcnt); // Save extra arguments
+ }
+@@ -341,14 +341,14 @@
+ varin(0) = args(3); varin(1) = "ode2r"; // Check structure
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ } // if (nargin >= 4)
+
+ else { // if nargin == 3, everything else has been checked before
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ /* Start PREPROCESSING, ie. check which options have been set and
+@@ -641,7 +641,7 @@
+ if (!vradauevefun.is_empty ()) odepkg_auxiliary_evaleventfun
+ (vradauevefun, vted, vfin, vradauextarg, 2);
+
+- // Get the stats information as an Octave_map if the option 'Stats'
++ // Get the stats information as an octave_scalar_map if the option 'Stats'
+ // has been set with odeset
+ // "nsteps", "nfailed", "nfevals", "npds", "ndecomps", "nlinsols"
+ octave_value_list vstatinput;
+@@ -660,7 +660,7 @@
+ // Set up output arguments that depend on how many output arguments
+ // are desired from the caller
+ if (nargout == 1) {
+- Octave_map vretmap;
++ octave_scalar_map vretmap;
+ vretmap.assign ("x", vtres);
+ vretmap.assign ("y", vyres);
+ vretmap.assign ("solver", "ode2r");
+diff -r dbbc8764a7dd -r 93bbfe2110b3 src/odepkg_octsolver_radau5.cc
+--- a/src/odepkg_octsolver_radau5.cc Tue Jan 07 15:06:58 2014 +0000
++++ b/src/odepkg_octsolver_radau5.cc Sun Mar 02 20:18:07 2014 +0100
+@@ -277,7 +277,7 @@
+
+ octave_idx_type nargin = args.length (); // The number of input arguments
+ octave_value_list vretval; // The cell array of return args
+- Octave_map vodeopt; // The OdePkg options structure
++ octave_scalar_map vodeopt; // The OdePkg options structure
+
+ // Check number and types of all input arguments
+ if (nargin < 3) {
+@@ -319,7 +319,7 @@
+ // Fourth input argument != OdePkg option, need a default structure
+ if (!args(3).is_map ()) {
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ for (octave_idx_type vcnt = 3; vcnt < nargin; vcnt++)
+ vradau5extarg(vcnt-3) = args(vcnt); // Save arguments in vradau5extarg
+ }
+@@ -330,7 +330,7 @@
+ varin(0) = args(3); varin(1) = "ode5r";
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create structure from args(4)
++ vodeopt = tmp(0).scalar_map_value (); // Create structure from args(4)
+ for (octave_idx_type vcnt = 4; vcnt < nargin; vcnt++)
+ vradau5extarg(vcnt-4) = args(vcnt); // Save extra arguments
+ }
+@@ -341,14 +341,14 @@
+ varin(0) = args(3); varin(1) = "ode5r"; // Check structure
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ } // if (nargin >= 4)
+
+ else { // if nargin == 3, everything else has been checked before
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ /* Start PREPROCESSING, ie. check which options have been set and
+@@ -653,7 +653,7 @@
+ if (!vradau5evefun.is_empty ()) odepkg_auxiliary_evaleventfun
+ (vradau5evefun, vted, vfin, vradau5extarg, 2);
+
+- // Get the stats information as an Octave_map if the option 'Stats'
++ // Get the stats information as an octave_scalar_map if the option 'Stats'
+ // has been set with odeset
+ // "nsteps", "nfailed", "nfevals", "npds", "ndecomps", "nlinsols"
+ octave_value_list vstatinput;
+@@ -672,7 +672,7 @@
+ // Set up output arguments that depend on how many output arguments
+ // are desired from the caller
+ if (nargout == 1) {
+- Octave_map vretmap;
++ octave_scalar_map vretmap;
+ vretmap.assign ("x", vtres);
+ vretmap.assign ("y", vyres);
+ vretmap.assign ("solver", "ode5r");
+diff -r dbbc8764a7dd -r 93bbfe2110b3 src/odepkg_octsolver_rodas.cc
+--- a/src/odepkg_octsolver_rodas.cc Tue Jan 07 15:06:58 2014 +0000
++++ b/src/odepkg_octsolver_rodas.cc Sun Mar 02 20:18:07 2014 +0100
+@@ -491,7 +491,7 @@
+
+ octave_idx_type nargin = args.length (); // The number of input arguments
+ octave_value_list vretval; // The cell array of return args
+- Octave_map vodeopt; // The OdePkg options structure
++ octave_scalar_map vodeopt; // The OdePkg options structure
+
+ // Check number and types of all input arguments
+ if (nargin < 3) {
+@@ -533,7 +533,7 @@
+ // Fourth input argument != OdePkg option, need a default structure
+ if (!args(3).is_map ()) {
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ for (octave_idx_type vcnt = 3; vcnt < nargin; vcnt++)
+ vrodasextarg(vcnt-3) = args(vcnt); // Save arguments in vrodasextarg
+ }
+@@ -544,7 +544,7 @@
+ varin(0) = args(3); varin(1) = "oders";
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create structure from args(4)
++ vodeopt = tmp(0).scalar_map_value (); // Create structure from args(4)
+ for (octave_idx_type vcnt = 4; vcnt < nargin; vcnt++)
+ vrodasextarg(vcnt-4) = args(vcnt); // Save extra arguments
+ }
+@@ -555,14 +555,14 @@
+ varin(0) = args(3); varin(1) = "oders"; // Check structure
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ } // if (nargin >= 4)
+
+ else { // if nargin == 3, everything else has been checked before
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ /* Start PREPROCESSING, ie. check which options have been set and
+@@ -854,7 +854,7 @@
+ if (!vrodasevefun.is_empty ()) odepkg_auxiliary_evaleventfun
+ (vrodasevefun, vted, vfin, vrodasextarg, 2);
+
+- // Get the stats information as an Octave_map if the option 'Stats'
++ // Get the stats information as an octave_scalar_map if the option 'Stats'
+ // has been set with odeset
+ octave_value_list vstatinput;
+ vstatinput(0) = IWORK[16];
+@@ -872,7 +872,7 @@
+ // Set up output arguments that depend on how many output arguments
+ // are desired from the caller
+ if (nargout == 1) {
+- Octave_map vretmap;
++ octave_scalar_map vretmap;
+ vretmap.assign ("x", vtres);
+ vretmap.assign ("y", vyres);
+ vretmap.assign ("solver", "oders");
+diff -r dbbc8764a7dd -r 93bbfe2110b3 src/odepkg_octsolver_seulex.cc
+--- a/src/odepkg_octsolver_seulex.cc Tue Jan 07 15:06:58 2014 +0000
++++ b/src/odepkg_octsolver_seulex.cc Sun Mar 02 20:18:07 2014 +0100
+@@ -285,7 +285,7 @@
+
+ octave_idx_type nargin = args.length (); // The number of input arguments
+ octave_value_list vretval; // The cell array of return args
+- Octave_map vodeopt; // The OdePkg options structure
++ octave_scalar_map vodeopt; // The OdePkg options structure
+
+ // Check number and types of all input arguments
+ if (nargin < 3) {
+@@ -327,7 +327,7 @@
+ // Fourth input argument != OdePkg option, need a default structure
+ if (!args(3).is_map ()) {
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ for (octave_idx_type vcnt = 3; vcnt < nargin; vcnt++)
+ vseulexextarg(vcnt-3) = args(vcnt); // Save arguments in vseulexextarg
+ }
+@@ -338,7 +338,7 @@
+ varin(0) = args(3); varin(1) = "odesx";
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create structure from args(4)
++ vodeopt = tmp(0).scalar_map_value (); // Create structure from args(4)
+ for (octave_idx_type vcnt = 4; vcnt < nargin; vcnt++)
+ vseulexextarg(vcnt-4) = args(vcnt); // Save extra arguments
+ }
+@@ -349,14 +349,14 @@
+ varin(0) = args(3); varin(1) = "odesx"; // Check structure
+ octave_value_list tmp = feval ("odepkg_structure_check", varin, 1);
+ if (error_state) return (vretval);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ } // if (nargin >= 4)
+
+ else { // if nargin == 3, everything else has been checked before
+ octave_value_list tmp = feval ("odeset", tmp, 1);
+- vodeopt = tmp(0).map_value (); // Create a default structure
++ vodeopt = tmp(0).scalar_map_value (); // Create a default structure
+ }
+
+ /* Start PREPROCESSING, ie. check which options have been set and
+@@ -653,7 +653,7 @@
+ if (!vseulexevefun.is_empty ()) odepkg_auxiliary_evaleventfun
+ (vseulexevefun, vted, vfin, vseulexextarg, 2);
+
+- // Get the stats information as an Octave_map if the option 'Stats'
++ // Get the stats information as an octave_scalar_map if the option 'Stats'
+ // has been set with odeset
+ octave_value_list vstatinput;
+ vstatinput(0) = IWORK[16];
+@@ -671,7 +671,7 @@
+ // Set up output arguments that depend on how many output arguments
+ // are desired from the caller
+ if (nargout == 1) {
+- Octave_map vretmap;
++ octave_scalar_map vretmap;
+ vretmap.assign ("x", vtres);
+ vretmap.assign ("y", vyres);
+ vretmap.assign ("solver", "odesx");
diff --git a/debian/patches/series b/debian/patches/series
index 4a360dd..6916451 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ info-dir-section.diff
correct-fflags-for-f77.patch
show-progress-in-rodas.patch
notparallel-makefile.patch
+remove-octave-map.patch
--
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-odepkg.git
More information about the Pkg-octave-commit
mailing list