Mercurial > hg > octave-lyh
diff src/ov-base.cc @ 4452:f3c21a1d1c62
[project @ 2003-07-09 23:20:18 by jwe]
| author | jwe |
|---|---|
| date | Wed, 09 Jul 2003 23:20:19 +0000 |
| parents | 689f730954b3 |
| children | d7d9ca19960a |
line wrap: on
line diff
--- a/src/ov-base.cc +++ b/src/ov-base.cc @@ -166,9 +166,9 @@ } octave_value -octave_base_value::convert_to_str (bool) const +octave_base_value::convert_to_str_internal (bool) const { - gripe_wrong_type_arg ("octave_base_value::convert_to_str ()", + gripe_wrong_type_arg ("octave_base_value::convert_to_str_internal ()", type_name ()); return octave_value (); } @@ -314,16 +314,11 @@ { charMatrix retval; - if (Vimplicit_num_to_str_ok) - { - octave_value tmp = convert_to_str (); + octave_value tmp = convert_to_str (); - if (! error_state) - retval = tmp.char_matrix_value (); - } - else - gripe_wrong_type_arg ("octave_base_value::char_matrix_value()", - type_name ()); + if (! error_state) + retval = tmp.char_matrix_value (); + return retval; } @@ -332,15 +327,10 @@ { string_vector retval; - if (Vimplicit_num_to_str_ok) - { - octave_value tmp = convert_to_str (pad); + octave_value tmp = convert_to_str (pad); - if (! error_state) - retval = tmp.all_strings (); - } - else - gripe_wrong_type_arg ("octave_base_value::all_strings()", type_name ()); + if (! error_state) + retval = tmp.all_strings (); return retval; } @@ -350,15 +340,10 @@ { std::string retval; - if (Vimplicit_num_to_str_ok) - { - octave_value tmp = convert_to_str (); + octave_value tmp = convert_to_str (); - if (! error_state) - retval = tmp.string_value (); - } - else - gripe_wrong_type_arg ("octave_base_value::string_value()", type_name ()); + if (! error_state) + retval = tmp.string_value (); return retval; }