Mercurial > octave-nkf
changeset 9690:f42f0d707e8e
don't register octave_char_matrix as a separate type
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Mon, 05 Oct 2009 07:53:29 +0200 |
| parents | 34d6f005db4b |
| children | 318e0cdd31bd |
| files | src/ChangeLog src/ov-ch-mat.cc src/ov-ch-mat.h src/ov.cc |
| diffstat | 4 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Oct 05 00:11:07 2009 -0400 +++ b/src/ChangeLog Mon Oct 05 07:53:29 2009 +0200 @@ -1,3 +1,10 @@ +2009-10-05 Jaroslav Hajek <highegg@gmail.com> + + * ov-ch-mat.h (octave_char_matrix): Don't declare allocator and + typeid. + * ov-ch-mat.cc: Don't define them. + * ov.cc (install_types): Don't register octave_char_matrix. + 2009-10-05 John W. Eaton <jwe@octave.org> * ov.h (octave_value (const charMatrix&, char, bool),
--- a/src/ov-ch-mat.cc Mon Oct 05 00:11:07 2009 -0400 +++ b/src/ov-ch-mat.cc Mon Oct 05 07:53:29 2009 +0200 @@ -39,11 +39,6 @@ template class octave_base_matrix<charNDArray>; -DEFINE_OCTAVE_ALLOCATOR (octave_char_matrix); - -DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_char_matrix, - "char matrix", "int8"); - idx_vector octave_char_matrix::index_vector (void) const {
--- a/src/ov-ch-mat.h Mon Oct 05 00:11:07 2009 -0400 +++ b/src/ov-ch-mat.h Mon Oct 05 07:53:29 2009 +0200 @@ -193,11 +193,6 @@ #undef BOOL_MAT_MAPPER -protected: - - DECLARE_OCTAVE_ALLOCATOR - - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif
--- a/src/ov.cc Mon Oct 05 00:11:07 2009 -0400 +++ b/src/ov.cc Mon Oct 05 07:53:29 2009 +0200 @@ -2614,7 +2614,6 @@ octave_range::register_type (); octave_bool::register_type (); octave_bool_matrix::register_type (); - octave_char_matrix::register_type (); octave_char_matrix_str::register_type (); octave_char_matrix_sq_str::register_type (); octave_int8_scalar::register_type ();