Mercurial > hg > octave-max
changeset 2411:31a279f31070
[project @ 1996-10-15 16:50:45 by jwe]
ov-str-mat.h
| author | jwe |
|---|---|
| date | Tue, 15 Oct 1996 16:50:45 +0000 |
| parents | 367485171742 |
| children | 1a1901564492 |
| files | src/ov-str-mat.cc src/ov-typeinfo.cc src/ov-typeinfo.h |
| diffstat | 3 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ov-str-mat.cc +++ b/src/ov-str-mat.cc @@ -50,7 +50,7 @@ return new octave_matrix (v.matrix_value ()); } -octave_value::numeric_conv_fcn +octave_value::type_conv_fcn octave_char_matrix_str::numeric_conversion_function (void) const { return default_numeric_conversion_function;
--- a/src/ov-typeinfo.cc +++ b/src/ov-typeinfo.cc @@ -48,8 +48,8 @@ template class Array<octave_value::assign_op_fcn>; template class Array2<octave_value::assign_op_fcn>; -template class Array<octave_value::widening_op_fcn>; -template class Array2<octave_value::widening_op_fcn>; +template class Array<octave_value::type_conv_fcn>; +template class Array2<octave_value::type_conv_fcn>; int octave_value_typeinfo::register_type (const string& name) @@ -93,7 +93,7 @@ bool octave_value_typeinfo::register_widening_op (int t, int t_result, - octave_value::widening_op_fcn f) + octave_value::type_conv_fcn f) { if (! instance) instance = new octave_value_typeinfo (); @@ -125,7 +125,7 @@ pref_assign_conv.resize (len, len, -1); - widening_ops.resize (len, len, (octave_value::widening_op_fcn) 0); + widening_ops.resize (len, len, (octave_value::type_conv_fcn) 0); } types (i) = name; @@ -165,7 +165,7 @@ bool octave_value_typeinfo::do_register_widening_op - (int t, int t_result, octave_value::widening_op_fcn f) + (int t, int t_result, octave_value::type_conv_fcn f) { widening_ops.checkelem (t, t_result) = f; @@ -193,7 +193,7 @@ return pref_assign_conv.checkelem (t_lhs, t_rhs); } -octave_value::widening_op_fcn +octave_value::type_conv_fcn octave_value_typeinfo::do_lookup_widening_op (int t, int t_result) { return widening_ops.checkelem (t, t_result);
--- a/src/ov-typeinfo.h +++ b/src/ov-typeinfo.h @@ -51,7 +51,7 @@ static bool register_pref_assign_conv (int, int, int); - static bool register_widening_op (int, int, octave_value::widening_op_fcn); + static bool register_widening_op (int, int, octave_value::type_conv_fcn); static octave_value::binary_op_fcn lookup_binary_op (octave_value::binary_op op, int t1, int t2) @@ -71,7 +71,7 @@ return instance->do_lookup_pref_assign_conv (t_lhs, t_rhs); } - static octave_value::widening_op_fcn + static octave_value::type_conv_fcn lookup_widening_op (int t, int t_result) { return instance->do_lookup_widening_op (t, t_result); @@ -90,7 +90,7 @@ (octave_value::binary_op_fcn) 0), assign_ops (32, 32, (octave_value::assign_op_fcn) 0), pref_assign_conv (32, 32, -1), - widening_ops (32, 32, (octave_value::widening_op_fcn) 0) { } + widening_ops (32, 32, (octave_value::type_conv_fcn) 0) { } private: @@ -106,7 +106,7 @@ Array2<int> pref_assign_conv; - Array2<octave_value::widening_op_fcn> widening_ops; + Array2<octave_value::type_conv_fcn> widening_ops; int do_register_type (const string&); @@ -117,7 +117,7 @@ bool do_register_pref_assign_conv (int, int, int); - bool do_register_widening_op (int, int, octave_value::widening_op_fcn); + bool do_register_widening_op (int, int, octave_value::type_conv_fcn); octave_value::binary_op_fcn do_lookup_binary_op (octave_value::binary_op, int, int); @@ -126,7 +126,7 @@ int do_lookup_pref_assign_conv (int, int); - octave_value::widening_op_fcn do_lookup_widening_op (int, int); + octave_value::type_conv_fcn do_lookup_widening_op (int, int); string_vector do_installed_type_names (void);