Mercurial > octave-nkf

comparison liboctave/array/idx-vector.cc @ 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
61 ("internal error: as_array not allowed for this index class"); 61 ("internal error: as_array not allowed for this index class");
62 62
63 return Array<octave_idx_type> (); 63 return Array<octave_idx_type> ();
64 } 64 }
65 65
66 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_colon_rep);
67 66
68 idx_vector::idx_colon_rep::idx_colon_rep (char c) 67 idx_vector::idx_colon_rep::idx_colon_rep (char c)
69 { 68 {
70 if (c != ':') 69 if (c != ':')
71 { 70 {
101 idx_vector::idx_colon_rep::print (std::ostream& os) const 100 idx_vector::idx_colon_rep::print (std::ostream& os) const
102 { 101 {
103 return os << ":"; 102 return os << ":";
104 } 103 }
105 104
106 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_range_rep);
107 105
108 idx_vector::idx_range_rep::idx_range_rep (octave_idx_type _start, 106 idx_vector::idx_range_rep::idx_range_rep (octave_idx_type _start,
109 octave_idx_type _limit, 107 octave_idx_type _limit,
110 octave_idx_type _step) 108 octave_idx_type _step)
111 : start(_start), len (_step ? std::max ((_limit - _start) / _step, static_cast<octave_idx_type> (0)) : -1), step (_step) 109 : start(_start), len (_step ? std::max ((_limit - _start) / _step, static_cast<octave_idx_type> (0)) : -1), step (_step)
256 octave_idx_type i = octave_int<octave_idx_type> (x).value (); 254 octave_idx_type i = octave_int<octave_idx_type> (x).value ();
257 255
258 return convert_index (i, conv_error, ext); 256 return convert_index (i, conv_error, ext);
259 } 257 }
260 258
261 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_scalar_rep);
262 259
263 template <class T> 260 template <class T>
264 idx_vector::idx_scalar_rep::idx_scalar_rep (T x) 261 idx_vector::idx_scalar_rep::idx_scalar_rep (T x)
265 : data (0) 262 : data (0)
266 { 263 {
315 idx_vector::idx_scalar_rep::as_array (void) 312 idx_vector::idx_scalar_rep::as_array (void)
316 { 313 {
317 return Array<octave_idx_type> (dim_vector (1, 1), data); 314 return Array<octave_idx_type> (dim_vector (1, 1), data);
318 } 315 }
319 316
320 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_vector_rep);
321 317
322 template <class T> 318 template <class T>
323 idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>& nda) 319 idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>& nda)
324 : data (0), len (nda.numel ()), ext (0), aowner (0), orig_dims (nda.dims ()) 320 : data (0), len (nda.numel ()), ext (0), aowner (0), orig_dims (nda.dims ())
325 { 321 {
643 aowner = new Array<octave_idx_type> (retval); 639 aowner = new Array<octave_idx_type> (retval);
644 return retval; 640 return retval;
645 } 641 }
646 } 642 }
647 643
648 DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_mask_rep);
649 644
650 idx_vector::idx_mask_rep::idx_mask_rep (bool b) 645 idx_vector::idx_mask_rep::idx_mask_rep (bool b)
651 : data (0), len (b ? 1 : 0), ext (0), lsti (-1), lste (-1), 646 : data (0), len (b ? 1 : 0), ext (0), lsti (-1), lste (-1),
652 aowner (0), orig_dims (len, len) 647 aowner (0), orig_dims (len, len)
653 { 648 {