# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1223324164 14400
# Node ID 23ff439ea0dd90e14f8dd3c9f187a45d4c52db4b
# Parent  69c5cce38c2957c217527fab3bd6adb12209b47b
Sparse-op-defs.h: undo previous change

diff -r 69c5cce38c29 -r 23ff439ea0dd liboctave/ChangeLog
--- a/liboctave/ChangeLog	Mon Oct 06 21:38:49 2008 +0200
+++ b/liboctave/ChangeLog	Mon Oct 06 16:16:04 2008 -0400
@@ -1,3 +1,7 @@
+2008-10-06  John W. Eaton  <jwe@octave.org>
+
+	* Spasre-op-defs.h: Undo previous change.
+
 2008-10-01  Jaroslav Hajek <highegg@gmail.com>
 
 	* oct-inttypes.h (octave_int<T>::one, octave_int<T>::zero): Declare
diff -r 69c5cce38c29 -r 23ff439ea0dd liboctave/Sparse-op-defs.h
--- a/liboctave/Sparse-op-defs.h	Mon Oct 06 21:38:49 2008 +0200
+++ b/liboctave/Sparse-op-defs.h	Mon Oct 06 16:16:04 2008 -0400
@@ -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) \
       { \