Mercurial > hg > octave-lyh
diff liboctave/array/dSparse.cc @ 16313:6aafe87a3144
use int64_t for idx type if --enable-64
* configure.ac: Check for and use int64_t instead of long if
--enable-64.
(IDX_TYPE_LONG): Delete definion. Change all uses to check
USE_64_BIT_IDX_T instead.
* MArray-i.cc: Instantiate arrays of int64_t instead of long, but only
if USE_64_BIT_IDX_T is defined.
* acinclinde.m4 (OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER): Use int64_t
instead of long.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 15 Mar 2013 07:07:08 -0400 |
| parents | 648dabbb4c6b |
| children |
line wrap: on
line diff
--- a/liboctave/array/dSparse.cc +++ b/liboctave/array/dSparse.cc @@ -5859,7 +5859,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef IDX_TYPE_LONG +#ifdef USE_64_BIT_IDX_T A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6075,7 +6075,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef IDX_TYPE_LONG +#ifdef USE_64_BIT_IDX_T A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6099,7 +6099,7 @@ B->packed = true; B->sorted = true; B->nz = 0; -#ifdef IDX_TYPE_LONG +#ifdef USE_64_BIT_IDX_T B->itype = CHOLMOD_LONG; #else B->itype = CHOLMOD_INT; @@ -6337,7 +6337,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef IDX_TYPE_LONG +#ifdef USE_64_BIT_IDX_T A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6571,7 +6571,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef IDX_TYPE_LONG +#ifdef USE_64_BIT_IDX_T A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6595,7 +6595,7 @@ B->packed = true; B->sorted = true; B->nz = 0; -#ifdef IDX_TYPE_LONG +#ifdef USE_64_BIT_IDX_T B->itype = CHOLMOD_LONG; #else B->itype = CHOLMOD_INT;