stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

catstruct.m: remove call to nargchk, which will be removed in future Matlab versions

time-shift
Johannes Pfeifer 2016-05-28 19:32:11 +02:00
parent eca30eff75
commit 118b3ccb74
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
license.txt
View File

@ -114,6 +114,7 @@ License: GPL-3+
Files: matlab/lmmcp/catstruct.m
Copyright: 2005 Jos van der Geest <jos@jasen.nl>
2013 Christophe Gouel
2016 Dynare Team
License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are

7
matlab/lmmcp/catstruct.m
View File

@ -48,6 +48,7 @@ function A = catstruct(varargin)
% Copyright (C) 2005 Jos van der Geest <jos@jasen.nl>
% Copyright (C) 2013 Christophe Gouel
% Copyright (C) 2016 Dynare Team
%
% Redistribution and use in source and binary forms, with or without
% modification, are permitted provided that the following conditions are
@ -83,14 +84,16 @@ function A = catstruct(varargin)
% (thanks to Tor Inge Birkenes for pointing this out).
% Rephrased the help section as well.
error(nargchk(1,Inf,nargin)) ;
narginchk(1, Inf);
N = nargin ;
if ~isstruct(varargin{end}),
if isequal(varargin{end},'sorted'),
sorted = 1 ;
N = N-1 ;
error(nargchk(1,Inf,N)) ;
if N<1
error('catstruct: wrong number of input arguments') ;
end
else
error('catstruct:InvalidArgument','Last argument should be a structure, or the string "sorted".') ;
end