Mercurial > octave

diff src/OPERATORS/op-fs-fs.cc @ 7922:935be827eaf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error for NaN values in & and | expressions
author John W. Eaton <jwe@octave.org>
date Fri, 11 Jul 2008 14:56:30 -0400
parents 87865ed7405f
children 283989f2da9b
line wrap: on
line diff
--- a/src/OPERATORS/op-fs-fs.cc	Thu Jul 10 17:36:20 2008 -0400
+++ b/src/OPERATORS/op-fs-fs.cc	Fri Jul 11 14:56:30 2008 -0400
@@ -114,8 +114,8 @@
   return octave_value (v2.float_value () / d);
 }
 
-DEFBINOP_OP (el_and, float_scalar, float_scalar, &&)
-DEFBINOP_OP (el_or, float_scalar, float_scalar, ||)
+DEFSCALARBOOLOP_OP (el_and, float_scalar, float_scalar, &&)
+DEFSCALARBOOLOP_OP (el_or, float_scalar, float_scalar, ||)
 
 DEFNDCATOP_FN (fs_fs, float_scalar, float_scalar, float_array, float_array, concat)
 DEFNDCATOP_FN (s_fs, scalar, float_scalar, float_array, float_array, concat)