Mercurial > octave-nkf

comparison liboctave/array/idx-vector.h @ 19632:76478d2da117

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unconditionally disable the octave_allocator class * configure.ac: Delete the --enable-octave-allocator option. * oct-alloc.h: Delete octave_allocator class. Warn if file is included. Unconditionally define macros to be empty. * NEWS: Make note of these changes. * oct-alloc.cc: Delete. * liboctave/util/module.mk (UTIL_SRC): Remove it from the list. * make_int.cc, Cell.h, oct-obj.cc, oct-obj.h, audiodevinfo.cc, ov-base-int.h, ov-base-scalar.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-complex.h, ov-cs-list.cc, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-java.cc, ov-java.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, pt-const.cc, pt-const.h, idx-vector.cc, idx-vector.h: Delete uses of oct-alloc.h and OCTAVE_ALLOCATOR macros.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Jan 2015 13:43:29 -0500
parents af41e41ad28e
children 4197fc428c7d
comparison
equal deleted inserted replaced
19631:db92e7e28e1f 19632:76478d2da117
32 #include <iosfwd> 32 #include <iosfwd>
33 #include <memory> 33 #include <memory>
34 34
35 #include "dim-vector.h" 35 #include "dim-vector.h"
36 #include "oct-inttypes.h" 36 #include "oct-inttypes.h"
37 #include "oct-alloc.h"
38 #include "oct-refcount.h" 37 #include "oct-refcount.h"
39 38
40 template<class T> class Array; 39 template<class T> class Array;
41 template<class T> class Sparse; 40 template<class T> class Sparse;
42 class Range; 41 class Range;
144 143
145 std::ostream& print (std::ostream& os) const; 144 std::ostream& print (std::ostream& os) const;
146 145
147 private: 146 private:
148 147
149 DECLARE_OCTAVE_ALLOCATOR
150 148
151 // No copying! 149 // No copying!
152 idx_colon_rep (const idx_colon_rep& idx); 150 idx_colon_rep (const idx_colon_rep& idx);
153 idx_colon_rep& operator = (const idx_colon_rep& idx); 151 idx_colon_rep& operator = (const idx_colon_rep& idx);
154 }; 152 };
206 204
207 Array<octave_idx_type> as_array (void); 205 Array<octave_idx_type> as_array (void);
208 206
209 private: 207 private:
210 208
211 DECLARE_OCTAVE_ALLOCATOR
212 209
213 // No copying! 210 // No copying!
214 idx_range_rep (const idx_range_rep& idx); 211 idx_range_rep (const idx_range_rep& idx);
215 idx_range_rep& operator = (const idx_range_rep& idx); 212 idx_range_rep& operator = (const idx_range_rep& idx);
216 213
263 260
264 Array<octave_idx_type> as_array (void); 261 Array<octave_idx_type> as_array (void);
265 262
266 private: 263 private:
267 264
268 DECLARE_OCTAVE_ALLOCATOR
269 265
270 // No copying! 266 // No copying!
271 idx_scalar_rep (const idx_scalar_rep& idx); 267 idx_scalar_rep (const idx_scalar_rep& idx);
272 idx_scalar_rep& operator = (const idx_scalar_rep& idx); 268 idx_scalar_rep& operator = (const idx_scalar_rep& idx);
273 269
330 326
331 Array<octave_idx_type> as_array (void); 327 Array<octave_idx_type> as_array (void);
332 328
333 private: 329 private:
334 330
335 DECLARE_OCTAVE_ALLOCATOR
336 331
337 // No copying! 332 // No copying!
338 idx_vector_rep (const idx_vector_rep& idx); 333 idx_vector_rep (const idx_vector_rep& idx);
339 idx_vector_rep& operator = (const idx_vector_rep& idx); 334 idx_vector_rep& operator = (const idx_vector_rep& idx);
340 335
404 399
405 Array<octave_idx_type> as_array (void); 400 Array<octave_idx_type> as_array (void);
406 401
407 private: 402 private:
408 403
409 DECLARE_OCTAVE_ALLOCATOR
410 404
411 // No copying! 405 // No copying!
412 idx_mask_rep (const idx_mask_rep& idx); 406 idx_mask_rep (const idx_mask_rep& idx);
413 idx_mask_rep& operator = (const idx_mask_rep& idx); 407 idx_mask_rep& operator = (const idx_mask_rep& idx);
414 408