Mercurial > octave

comparison liboctave/array/DiagArray2.h @ 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 538b57866b90
children 1473547f50f5
comparison
equal deleted inserted replaced
21228:77a622392714 21229:a83e7a384ee0
131 return check_idx (r, c) ? elem (r, c) : T (0); 131 return check_idx (r, c) ? elem (r, c) : T (0);
132 } 132 }
133 133
134 T operator () (octave_idx_type r, octave_idx_type c) const 134 T operator () (octave_idx_type r, octave_idx_type c) const
135 { 135 {
136 #if defined (ENABLE_BOUNDS_CHECK) 136 #if defined (OCTAVE_ENABLE_BOUNDS_CHECK)
137 return checkelem (r, c); 137 return checkelem (r, c);
138 #else 138 #else
139 return elem (r, c); 139 return elem (r, c);
140 #endif 140 #endif
141 } 141 }
146 return check_idx (r, c) ? elem (r, c) : zero; 146 return check_idx (r, c) ? elem (r, c) : zero;
147 } 147 }
148 148
149 T& operator () (octave_idx_type r, octave_idx_type c) 149 T& operator () (octave_idx_type r, octave_idx_type c)
150 { 150 {
151 #if defined (ENABLE_BOUNDS_CHECK) 151 #if defined (OCTAVE_ENABLE_BOUNDS_CHECK)
152 return checkelem (r, c); 152 return checkelem (r, c);
153 #else 153 #else
154 return elem (r, c); 154 return elem (r, c);
155 #endif 155 #endif
156 } 156 }