Mercurial > hg > octave-nkf

comparison src/ov-type-conv.h @ 10184:b39bd23019eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
partially revert a668fbd32e34
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 21 Jan 2010 21:27:16 +0100
parents a668fbd32e34
children f3b65e1ae355
comparison
equal deleted inserted replaced
10183:bb97e11ce1ba 10184:b39bd23019eb
30 int t_arg = arg.type_id (); 30 int t_arg = arg.type_id ();
31 octave_value retval; 31 octave_value retval;
32 32
33 if (t_arg == t_result || arg.class_name () == name) 33 if (t_arg == t_result || arg.class_name () == name)
34 { 34 {
35 retval = arg.storable_value (); 35 retval = arg;
36 } 36 }
37 else 37 else
38 { 38 {
39 octave_base_value::type_conv_fcn cf1 39 octave_base_value::type_conv_fcn cf1
40 = octave_value_typeinfo::lookup_type_conv_op (t_arg, t_result); 40 = octave_value_typeinfo::lookup_type_conv_op (t_arg, t_result);