Re: MSVC patch: CXSparse support for MSVC

[John W. Eaton]

On 13-Jun-2007, Michael Goffioul wrote:

| On 6/13/07, John W. Eaton <address@hidden> wrote:
| > What changes to aclocal.m4 do you mean?  Can you send a patch for this
| > change?
| 
| OK, here's a simplified patch.

David, if this is OK, will you please check it in?

Thanks,

jwe


Index: configure.in
===================================================================
RCS file: /cvs/octave/configure.in,v
retrieving revision 1.565
diff -c -p -r1.565 configure.in
*** configure.in        13 Jun 2007 05:23:56 -0000      1.565
--- configure.in        13 Jun 2007 14:40:51 -0000
*************** AC_ARG_WITH(cxsparse,
*** 995,1000 ****
--- 995,1001 ----
  warn_cxsparse="CXSparse not found. This will result in some lack of
functionality for sparse matrices."
  if test "$with_cxsparse" = yes; then
    with_cxsparse=no
+   AC_LANG_PUSH(C++)
    AC_CHECK_HEADERS([suitesparse/cs.h ufsparse/cs.h cxsparse/cs.h cs.h], [
      AC_CHECK_LIB(cxsparse, cs_di_sqr, [CXSPARSE_LIBS="-lcxsparse";
with_cxsparse=yes])
      if test "$with_cxsparse" = yes; then
*************** if test "$with_cxsparse" = yes; then
*** 1002,1007 ****
--- 1003,1009 ----
        warn_cxsparse=
      fi
      break])
+   AC_LANG_POP(C++)
  fi
  if test -n "$warn_cxsparse"; then
    AC_MSG_WARN($warn_cxsparse)
Index: liboctave/SparseCmplxQR.cc
===================================================================
RCS file: /cvs/octave/liboctave/SparseCmplxQR.cc,v
retrieving revision 1.9
diff -c -p -r1.9 SparseCmplxQR.cc
*** liboctave/SparseCmplxQR.cc  2 Jun 2007 11:39:42 -0000       1.9
--- liboctave/SparseCmplxQR.cc  13 Jun 2007 14:40:51 -0000
*************** typedef double _Complex cs_complex_t;
*** 37,49 ****
    OCTAVE_LOCAL_BUFFER (double, buf ## tmp, (2 * (n))); \
    cs_complex_t *buf = reinterpret_cast<cs_complex_t *> (buf ## tmp);

  #else
  #define OCTAVE_C99_COMPLEX(buf, n) \
    OCTAVE_LOCAL_BUFFER (cs_complex_t, buf, (n));
  #endif

- #define OCTAVE_C99_ZERO (0. + 0.iF)
-
  SparseComplexQR::SparseComplexQR_rep::SparseComplexQR_rep
  (GCC_ATTR_UNUSED const SparseComplexMatrix& a, GCC_ATTR_UNUSED int order)
  {
--- 37,49 ----
    OCTAVE_LOCAL_BUFFER (double, buf ## tmp, (2 * (n))); \
    cs_complex_t *buf = reinterpret_cast<cs_complex_t *> (buf ## tmp);

+ #define OCTAVE_C99_ZERO (0. + 0.iF);
  #else
  #define OCTAVE_C99_COMPLEX(buf, n) \
    OCTAVE_LOCAL_BUFFER (cs_complex_t, buf, (n));
+ #define OCTAVE_C99_ZERO cs_complex_t(0., 0.);
  #endif

  SparseComplexQR::SparseComplexQR_rep::SparseComplexQR_rep
  (GCC_ATTR_UNUSED const SparseComplexMatrix& a, GCC_ATTR_UNUSED int order)
  {