Mercurial > octave-nkf
changeset 8186:23ff439ea0dd
Sparse-op-defs.h: undo previous change
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 06 Oct 2008 16:16:04 -0400 |
| parents | 69c5cce38c29 |
| children | b04109600a82 |
| files | liboctave/ChangeLog liboctave/Sparse-op-defs.h |
| diffstat | 2 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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) \ { \