# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1254722009 -7200
# Node ID f42f0d707e8ed2961bbde799a8da4e7446b8e02c
# Parent  34d6f005db4b3c7e4c1678c9f5cfb407c23a0fed
don't register octave_char_matrix as a separate type

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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),
diff --git a/src/ov-ch-mat.cc b/src/ov-ch-mat.cc
--- a/src/ov-ch-mat.cc
+++ b/src/ov-ch-mat.cc
@@ -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
 { 
diff --git a/src/ov-ch-mat.h b/src/ov-ch-mat.h
--- a/src/ov-ch-mat.h
+++ b/src/ov-ch-mat.h
@@ -193,11 +193,6 @@
 
 #undef BOOL_MAT_MAPPER
 
-protected:
-
-  DECLARE_OCTAVE_ALLOCATOR
-
-  DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
 };
 
 #endif
diff --git a/src/ov.cc b/src/ov.cc
--- a/src/ov.cc
+++ b/src/ov.cc
@@ -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 ();