Mercurial > octave
diff liboctave/array/Array.cc @ 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 | f7121e111991 |
| children | 40de9f8f23a6 |
line wrap: on
line diff
--- a/liboctave/array/Array.cc Mon Feb 08 20:45:26 2016 -0500 +++ b/liboctave/array/Array.cc Mon Feb 08 17:30:29 2016 -0500 @@ -258,7 +258,7 @@ Array<T>::column (octave_idx_type k) const { octave_idx_type r = dimensions(0); -#ifdef ENABLE_BOUNDS_CHECK +#ifdef OCTAVE_ENABLE_BOUNDS_CHECK if (k < 0 || k > dimensions.numel (1)) err_index_out_of_range (2, 2, k+1, dimensions.numel (1), dimensions); #endif @@ -273,7 +273,7 @@ octave_idx_type r = dimensions(0); octave_idx_type c = dimensions(1); octave_idx_type p = r*c; -#ifdef ENABLE_BOUNDS_CHECK +#ifdef OCTAVE_ENABLE_BOUNDS_CHECK if (k < 0 || k > dimensions.numel (2)) err_index_out_of_range (3, 3, k+1, dimensions.numel (2), dimensions); #endif @@ -285,7 +285,7 @@ Array<T> Array<T>::linear_slice (octave_idx_type lo, octave_idx_type up) const { -#ifdef ENABLE_BOUNDS_CHECK +#ifdef OCTAVE_ENABLE_BOUNDS_CHECK if (lo < 0) err_index_out_of_range (1, 1, lo+1, numel (), dimensions); if (up > numel ())