Mercurial > jwe > octave
diff liboctave/array/Array.h @ 21131:54527108599a
store more --enable-FEATURE info in octave_config_info
* configure.ac: (ENABLE_64, ENABLE_BOUNDS_CHECK, ENABLE_DOCS,
ENABLE_FLOAT_TRUNCATE, ENABLE_JIT, ENABLE_OPENMP): New variables.
macros. Handle consistently and AC_DEFINE them.
* common.mk, toplev.cc, oct-conf.in.h: Substitute new variables and
store them in octave_config_info.
* oct-conf-post.in.h: Provide old macro names for compatibility.
* Array.cc, Array.h, DiagArray2.h, PermMatrix.h, Range.cc, Sparse.h,
dim-vector.h, idx-vector.h, oct-refcount.h: Fix uses of macros.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 21 Jan 2016 18:18:16 -0500 |
| parents | 3e7cfee5f786 |
| children | 2e5c1f766ac9 |
line wrap: on
line diff
--- a/liboctave/array/Array.h Thu Jan 21 18:12:34 2016 -0500 +++ b/liboctave/array/Array.h Thu Jan 21 18:18:16 2016 -0500 @@ -393,7 +393,7 @@ T& elem (const Array<octave_idx_type>& ra_idx) { return Array<T>::elem (compute_index_unchecked (ra_idx)); } -#if defined (BOUNDS_CHECKING) +#if defined (ENABLE_BOUNDS_CHECK) T& operator () (octave_idx_type n) { return checkelem (n); } T& operator () (octave_idx_type i, octave_idx_type j) { return checkelem (i, j); } @@ -427,7 +427,7 @@ crefT elem (const Array<octave_idx_type>& ra_idx) const { return Array<T>::xelem (compute_index_unchecked (ra_idx)); } -#if defined (BOUNDS_CHECKING) +#if defined (ENABLE_BOUNDS_CHECK) crefT operator () (octave_idx_type n) const { return checkelem (n); } crefT operator () (octave_idx_type i, octave_idx_type j) const { return checkelem (i, j); } @@ -448,7 +448,8 @@ #endif // Fast extractors. All of these produce shallow copies. - // Warning: none of these do check bounds, unless BOUNDS_CHECKING is on! + // Warning: none of these do check bounds, unless + // ENABLE_BOUNDS_CHECK is defined! //! Extract column: A(:,k+1). Array<T> column (octave_idx_type k) const;