Mercurial > octave

comparison liboctave/array/dSparse.cc @ 21229:a83e7a384ee0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
create and install a subset of config.h in octave-config.h * mk-octave-config-h.sh: New file. * Makefile.am (EXTRA_DIST): Add mk-octave-config.h.sh to the list. (octinclude_HEADERS): Add octave-config.h to the list. (octave-config.h): New rule. * common.mk (do_subst_config_vals, do_subst_cross_config_vals): Don't substitute unused ENABLE options. * configure.ac: Note the reason for using oct-conf-post.in.h. Add OCTAVE_ prefix to ENABLE_BOUNDS_CHECK ENABLE_ATOMIC_REFCOUNT, ENABLE_64, ENABLE_OPENMP, and ENABLE_FLOAT_TRUNCATE in calls to AC_DEFINE. Change all uses. * oct-conf-post.in.h: Define HAVE_OCTAVE_DEPRECATED_ATTR instead of HAVE_ATTR_DEPRECATED. Likewise for HAVE_ATTR_NORETURN and HAVE_ATTR_UNUSED. Change all uses.
author John W. Eaton <jwe@octave.org>
date Mon, 08 Feb 2016 17:30:29 -0500
parents ddf0a5f3a967
children 40de9f8f23a6
comparison
equal deleted inserted replaced
21228:77a622392714 21229:a83e7a384ee0
5792 A->i = ridx (); 5792 A->i = ridx ();
5793 A->nzmax = nnz (); 5793 A->nzmax = nnz ();
5794 A->packed = true; 5794 A->packed = true;
5795 A->sorted = true; 5795 A->sorted = true;
5796 A->nz = 0; 5796 A->nz = 0;
5797 #if defined (ENABLE_64) 5797 #if defined (OCTAVE_ENABLE_64)
5798 A->itype = CHOLMOD_LONG; 5798 A->itype = CHOLMOD_LONG;
5799 #else 5799 #else
5800 A->itype = CHOLMOD_INT; 5800 A->itype = CHOLMOD_INT;
5801 #endif 5801 #endif
5802 A->dtype = CHOLMOD_DOUBLE; 5802 A->dtype = CHOLMOD_DOUBLE;
6012 A->i = ridx (); 6012 A->i = ridx ();
6013 A->nzmax = nnz (); 6013 A->nzmax = nnz ();
6014 A->packed = true; 6014 A->packed = true;
6015 A->sorted = true; 6015 A->sorted = true;
6016 A->nz = 0; 6016 A->nz = 0;
6017 #if defined (ENABLE_64) 6017 #if defined (OCTAVE_ENABLE_64)
6018 A->itype = CHOLMOD_LONG; 6018 A->itype = CHOLMOD_LONG;
6019 #else 6019 #else
6020 A->itype = CHOLMOD_INT; 6020 A->itype = CHOLMOD_INT;
6021 #endif 6021 #endif
6022 A->dtype = CHOLMOD_DOUBLE; 6022 A->dtype = CHOLMOD_DOUBLE;
6036 B->i = b.ridx (); 6036 B->i = b.ridx ();
6037 B->nzmax = b.nnz (); 6037 B->nzmax = b.nnz ();
6038 B->packed = true; 6038 B->packed = true;
6039 B->sorted = true; 6039 B->sorted = true;
6040 B->nz = 0; 6040 B->nz = 0;
6041 #if defined (ENABLE_64) 6041 #if defined (OCTAVE_ENABLE_64)
6042 B->itype = CHOLMOD_LONG; 6042 B->itype = CHOLMOD_LONG;
6043 #else 6043 #else
6044 B->itype = CHOLMOD_INT; 6044 B->itype = CHOLMOD_INT;
6045 #endif 6045 #endif
6046 B->dtype = CHOLMOD_DOUBLE; 6046 B->dtype = CHOLMOD_DOUBLE;
6277 A->i = ridx (); 6277 A->i = ridx ();
6278 A->nzmax = nnz (); 6278 A->nzmax = nnz ();
6279 A->packed = true; 6279 A->packed = true;
6280 A->sorted = true; 6280 A->sorted = true;
6281 A->nz = 0; 6281 A->nz = 0;
6282 #if defined (ENABLE_64) 6282 #if defined (OCTAVE_ENABLE_64)
6283 A->itype = CHOLMOD_LONG; 6283 A->itype = CHOLMOD_LONG;
6284 #else 6284 #else
6285 A->itype = CHOLMOD_INT; 6285 A->itype = CHOLMOD_INT;
6286 #endif 6286 #endif
6287 A->dtype = CHOLMOD_DOUBLE; 6287 A->dtype = CHOLMOD_DOUBLE;
6514 A->i = ridx (); 6514 A->i = ridx ();
6515 A->nzmax = nnz (); 6515 A->nzmax = nnz ();
6516 A->packed = true; 6516 A->packed = true;
6517 A->sorted = true; 6517 A->sorted = true;
6518 A->nz = 0; 6518 A->nz = 0;
6519 #if defined (ENABLE_64) 6519 #if defined (OCTAVE_ENABLE_64)
6520 A->itype = CHOLMOD_LONG; 6520 A->itype = CHOLMOD_LONG;
6521 #else 6521 #else
6522 A->itype = CHOLMOD_INT; 6522 A->itype = CHOLMOD_INT;
6523 #endif 6523 #endif
6524 A->dtype = CHOLMOD_DOUBLE; 6524 A->dtype = CHOLMOD_DOUBLE;
6538 B->i = b.ridx (); 6538 B->i = b.ridx ();
6539 B->nzmax = b.nnz (); 6539 B->nzmax = b.nnz ();
6540 B->packed = true; 6540 B->packed = true;
6541 B->sorted = true; 6541 B->sorted = true;
6542 B->nz = 0; 6542 B->nz = 0;
6543 #if defined (ENABLE_64) 6543 #if defined (OCTAVE_ENABLE_64)
6544 B->itype = CHOLMOD_LONG; 6544 B->itype = CHOLMOD_LONG;
6545 #else 6545 #else
6546 B->itype = CHOLMOD_INT; 6546 B->itype = CHOLMOD_INT;
6547 #endif 6547 #endif
6548 B->dtype = CHOLMOD_DOUBLE; 6548 B->dtype = CHOLMOD_DOUBLE;