# HG changeset patch # User John W. Eaton # Date 1215620797 14400 # Node ID b2f212b514889754baaeda30a39141ecb943b142 # Parent 7ba62ea0f1618e7659d4ff864ef9c09489f9b9be DLD-FUNCTIONS/expm.cc (expm): Avoid GCC warning diff -r 7ba62ea0f161 -r b2f212b51488 src/ChangeLog --- a/src/ChangeLog Wed Jul 09 18:09:51 2008 +0200 +++ b/src/ChangeLog Wed Jul 09 12:26:37 2008 -0400 @@ -1,5 +1,7 @@ 2008-07-09 John W. Eaton + * DLD-FUNCTIONS/expm.cc (expm): Avoid GCC warning. + * ov-fcn-inline.cc (octave_fcn_inline::load_ascii): Avoid GCC warning. 2008-07-09 Michael Goffioul diff -r 7ba62ea0f161 -r b2f212b51488 src/DLD-FUNCTIONS/expm.cc --- a/src/DLD-FUNCTIONS/expm.cc Wed Jul 09 18:09:51 2008 +0200 +++ b/src/DLD-FUNCTIONS/expm.cc Wed Jul 09 12:26:37 2008 -0400 @@ -139,11 +139,9 @@ if (arg_is_empty < 0) return retval; + if (arg_is_empty > 0) - if (isfloat) - return octave_value (FloatMatrix ()); - else - return octave_value (Matrix ()); + return isfloat ? octave_value (FloatMatrix ()) : octave_value (Matrix ()); if (nr != nc) {