Mercurial > octave
changeset 32803:9af92adc800e
maint: Merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Mon, 22 Jan 2024 10:39:03 +0100 |
parents | ffff22bd5e5e (current diff) 2c9723b02921 (diff) |
children | 1cb4c5f312aa |
files | examples/code/fortrandemo.cc |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/code/fortrandemo.cc Sat Jan 20 15:39:33 2024 -0500 +++ b/examples/code/fortrandemo.cc Mon Jan 22 10:39:03 2024 +0100 @@ -4,7 +4,7 @@ extern "C" { F77_RET_T - F77_FUNC (fortransub, FORTSUB) + F77_FUNC (fortransub, FORTRANSUB) (const F77_INT&, F77_DBLE*, F77_CHAR_ARG_DECL F77_CHAR_ARG_LEN_DECL); } @@ -20,7 +20,7 @@ OCTAVE_LOCAL_BUFFER (char, ctmp, 128); - F77_XFCN (fortransub, FORTSUB, + F77_XFCN (fortransub, FORTRANSUB, (na, av, ctmp F77_CHAR_ARG_LEN (128))); return ovl (a, std::string (ctmp));
--- a/scripts/set/unique.m Sat Jan 20 15:39:33 2024 -0500 +++ b/scripts/set/unique.m Mon Jan 22 10:39:03 2024 +0100 @@ -87,7 +87,7 @@ ## The third output, @var{j}, has not been implemented yet when the sort ## order is @qcode{"stable"}. ## -## @seealso{union, intersect, setdiff, setxor, ismember} +## @seealso{uniquetol, union, intersect, setdiff, setxor, ismember} ## @end deftypefn function [y, i, j] = unique (x, varargin)