Mercurial > octave
diff liboctave/array/Sparse.h @ 21229:a83e7a384ee0
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 | 538b57866b90 |
children | 1473547f50f5 |
line wrap: on
line diff
--- a/liboctave/array/Sparse.h Mon Feb 08 20:45:26 2016 -0500 +++ b/liboctave/array/Sparse.h Mon Feb 08 17:30:29 2016 -0500 @@ -386,7 +386,7 @@ T& elem (const Array<octave_idx_type>& ra_idx) { return Sparse<T>::elem (compute_index (ra_idx)); } -#if defined (ENABLE_BOUNDS_CHECK) +#if defined (OCTAVE_ENABLE_BOUNDS_CHECK) T& operator () (octave_idx_type n) { return checkelem (n); @@ -453,7 +453,7 @@ T elem (const Array<octave_idx_type>& ra_idx) const { return Sparse<T>::elem (compute_index (ra_idx)); } -#if defined (ENABLE_BOUNDS_CHECK) +#if defined (OCTAVE_ENABLE_BOUNDS_CHECK) T operator () (octave_idx_type n) const { return checkelem (n); } T operator () (octave_idx_type i, octave_idx_type j) const {