# HG changeset patch # User John Donoghue # Date 1546522901 18000 # Node ID aa8e596703c20b3e5ce251859181b768d2d3e0d3 # Parent 88cdb3e708a2f2ed55db44d1aa33d577a4701460 * src/of-miscellaneous-3-dev-fixes.patch: update patch for dev 6.0 diff -r 88cdb3e708a2 -r aa8e596703c2 src/of-miscellaneous-3-dev-fixes.patch --- a/src/of-miscellaneous-3-dev-fixes.patch Wed Jan 02 10:04:32 2019 -0500 +++ b/src/of-miscellaneous-3-dev-fixes.patch Thu Jan 03 08:41:41 2019 -0500 @@ -10,3 +10,36 @@ if (isempty (fpath)) error ("units: %s\nVerify that GNU units is installed in the current path.", rawoutput); +diff -ur miscellaneous-1.2.1.orig/src/partint.cc miscellaneous-1.2.1/src/partint.cc +--- miscellaneous-1.2.1.orig/src/partint.cc 2019-01-02 12:13:28.286461534 -0500 ++++ miscellaneous-1.2.1/src/partint.cc 2019-01-02 12:14:43.200262618 -0500 +@@ -77,7 +77,7 @@ + error("partcnt accepts exactly one argument"); + return r; + } +- if ( ! args(0).is_numeric_type()) { ++ if ( ! args(0).isnumeric()) { + error("partcnt only accepts a numeric argument"); + return r; + } +@@ -181,7 +181,7 @@ + int nargin = args.length (); + if (nargin != 1 || + ! args(0).is_scalar_type() || +- ! args(0).is_numeric_type() ++ ! args(0).isnumeric() + ) { + error("partint only accepts one scalar positive integer argument"); + return r; +diff -ur miscellaneous-1.2.1.orig/src/sample.cc miscellaneous-1.2.1/src/sample.cc +--- miscellaneous-1.2.1.orig/src/sample.cc 2019-01-02 12:18:26.373626834 -0500 ++++ miscellaneous-1.2.1/src/sample.cc 2019-01-02 12:19:15.234801067 -0500 +@@ -123,7 +123,7 @@ + /* as in the code from "Programming Pearls" */ + IntSetBins2 S(m, n); + while (S.size() < m) +- S.insert(floor(oct_randu()*n)); // use Octave's uniform RNG ++ S.insert(floor(octave::rand_uniform ()*n)); // use Octave's uniform RNG + S.report(s.fortran_vec()); + return octave_value (s); + }