Mercurial > hg > octave-nkf

diff liboctave/Sparse-op-defs.h @ 8186:23ff439ea0dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sparse-op-defs.h: undo previous change
author John W. Eaton <jwe@octave.org>
date Mon, 06 Oct 2008 16:16:04 -0400
parents 1ebcb9872ced
children b04109600a82
line wrap: on
line diff
--- a/liboctave/Sparse-op-defs.h
+++ b/liboctave/Sparse-op-defs.h
@@ -749,11 +749,15 @@
     \
     if (m1_nr == 1 && m1_nc == 1) \
       { \
-        r = F (m1.elem(0,0) != M1::elt_type (), m2); \
+        extern OCTAVE_API SparseBoolMatrix F (const double&, const M2&); \
+        extern OCTAVE_API SparseBoolMatrix F (const Complex&, const M2&); \
+        r = F (m1.elem(0,0), m2); \
       } \
     else if (m2_nr == 1 && m2_nc == 1) \
       { \
-        r = F (m1, m2.elem(0,0) != M2::elt_type ()); \
+        extern OCTAVE_API SparseBoolMatrix F (const M1&, const double&); \
+        extern OCTAVE_API SparseBoolMatrix F (const M1&, const Complex&); \
+        r = F (m1, m2.elem(0,0)); \
       } \
     else if (m1_nr == m2_nr && m1_nc == m2_nc) \
       { \
@@ -879,11 +883,15 @@
     \
     if (m1_nr == 1 && m1_nc == 1) \
       { \
-        r = F (m1.elem(0,0) != M1::elt_type (), m2); \
+        extern OCTAVE_API SparseBoolMatrix F (const double&, const M2&); \
+        extern OCTAVE_API SparseBoolMatrix F (const Complex&, const M2&); \
+        r = F (m1.elem(0,0), m2); \
       } \
     else if (m2_nr == 1 && m2_nc == 1) \
       { \
-        r = F (m1, m2.elem(0,0) != M2::elt_type ()); \
+        extern OCTAVE_API SparseBoolMatrix F (const M1&, const double&); \
+        extern OCTAVE_API SparseBoolMatrix F (const M1&, const Complex&); \
+        r = F (m1, m2.elem(0,0)); \
       } \
     else if (m1_nr == m2_nr && m1_nc == m2_nc) \
       { \