Mercurial > hg > octave-nkf
comparison libinterp/octave-value/ov-struct.cc @ 19795:76478d2da117
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 | 1fa328da03ef |
| children | 4197fc428c7d |
comparison
equal
deleted
inserted
replaced
| 19794:db92e7e28e1f | 19795:76478d2da117 |
|---|---|
| 45 #include "ls-oct-binary.h" | 45 #include "ls-oct-binary.h" |
| 46 #include "ls-hdf5.h" | 46 #include "ls-hdf5.h" |
| 47 #include "ls-utils.h" | 47 #include "ls-utils.h" |
| 48 #include "pr-output.h" | 48 #include "pr-output.h" |
| 49 | 49 |
| 50 DEFINE_OCTAVE_ALLOCATOR(octave_struct); | |
| 51 | 50 |
| 52 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_struct, "struct", "struct"); | 51 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_struct, "struct", "struct"); |
| 53 | 52 |
| 54 // How many levels of structure elements should we print? | 53 // How many levels of structure elements should we print? |
| 55 static int Vstruct_levels_to_print = 2; | 54 static int Vstruct_levels_to_print = 2; |
| 1130 && map.fast_elem_insert (n, *sm_ptr)); | 1129 && map.fast_elem_insert (n, *sm_ptr)); |
| 1131 } | 1130 } |
| 1132 | 1131 |
| 1133 return retval; | 1132 return retval; |
| 1134 } | 1133 } |
| 1135 DEFINE_OCTAVE_ALLOCATOR(octave_scalar_struct); | |
| 1136 | 1134 |
| 1137 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_scalar_struct, "scalar struct", | 1135 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_scalar_struct, "scalar struct", |
| 1138 "struct"); | 1136 "struct"); |
| 1139 | 1137 |
| 1140 octave_value | 1138 octave_value |