Mercurial > octave-nkf
changeset 9856:870a69bac55c
fix test in merge
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Mon, 23 Nov 2009 10:50:10 +0100 |
| parents | 02d59b67632f |
| children | 43a7adf62534 |
| files | src/ChangeLog src/data.cc |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Nov 23 21:27:40 2009 -0800 +++ b/src/ChangeLog Mon Nov 23 10:50:10 2009 +0100 @@ -1,3 +1,7 @@ +2009-11-23 Jaroslav Hajek <highegg@gmail.com> + + * data.cc (Fmerge): Add missing parentheses. + 2009-11-23 Jaroslav Hajek <highegg@gmail.com> * ov-complex.h (octave_complex::bool_value,
--- a/src/data.cc Mon Nov 23 21:27:40 2009 -0800 +++ b/src/data.cc Mon Nov 23 10:50:10 2009 +0100 @@ -6491,7 +6491,7 @@ int nargin = args.length (); octave_value retval; - if (nargin == 3 && args(0).is_bool_type () || args(0).is_numeric_type ()) + if (nargin == 3 && (args(0).is_bool_type () || args(0).is_numeric_type ())) { octave_value mask_val = args(0);