Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Johannes Pfeifer
dynare
Commits
44f3a260
Unverified
Commit
44f3a260
authored
Dec 17, 2020
by
Sébastien Villemot
Browse files
Octave 6 compatibility fix
By the way, remove an obsolete version test for MATLAB (since we now require R2014a).
parent
84566ada
Changes
1
Hide whitespace changes
Inline
Side-by-side
matlab/lmmcp/catstruct.m
View file @
44f3a260
...
...
@@ -48,7 +48,7 @@ function A = catstruct(varargin)
% Copyright (C) 2005 Jos van der Geest <jos@jasen.nl>
% Copyright (C) 2013 Christophe Gouel
% Copyright (C) 2016-20
17
Dynare Team
% Copyright (C) 2016-20
20
Dynare Team
%
% Redistribution and use in source and binary forms, with or without
% modification, are permitted provided that the following conditions are
...
...
@@ -150,7 +150,7 @@ else
FN
=
squeeze
(
FN
)
;
VAL
=
squeeze
(
VAL
)
;
MatlabVersion
=
version
;
if
isoctave
||
str2double
(
MatlabVersion
(
end
-
5
:
end
-
2
))
<
2013
% Equivalent to, but faster than if
ver
L
ess
T
han('
matlab','8.1
')
if
isoctave
&&
octave_
ver
_l
ess
_t
han
(
'
6
'
)
[
UFN
,
ind
]
=
unique
(
FN
)
;
else
[
UFN
,
ind
]
=
unique
(
FN
,
'legacy'
)
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment