Mercurial > hg > octave-max

comparison src/ov-type-conv.h @ 8184:bb3bdcdaa063

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oct-type-conv.h (octave_type_conv_body): avoid shadow warning from GCC
author John W. Eaton <jwe@octave.org>
date Mon, 06 Oct 2008 14:12:09 -0400
parents 283989f2da9b
children eb63fbe60fab
comparison
equal deleted inserted replaced
8183:277218396978 8184:bb3bdcdaa063
31 { 31 {
32 retval = arg; 32 retval = arg;
33 } 33 }
34 else 34 else
35 { 35 {
36 octave_base_value::type_conv_fcn cf 36 octave_base_value::type_conv_fcn cf1
37 = octave_value_typeinfo::lookup_type_conv_op (t_arg, t_result); 37 = octave_value_typeinfo::lookup_type_conv_op (t_arg, t_result);
38 38
39 if (cf) 39 if (cf1)
40 { 40 {
41 octave_base_value *tmp (cf (*(arg.internal_rep ()))); 41 octave_base_value *tmp (cf1 (*(arg.internal_rep ())));
42 42
43 if (tmp) 43 if (tmp)
44 { 44 {
45 retval = octave_value (tmp); 45 retval = octave_value (tmp);
46 46
47 retval.maybe_mutate (); 47 retval.maybe_mutate ();
48 } 48 }
49 } 49 }
50 else 50 else
51 { 51 {
52 octave_base_value::type_conv_fcn cf 52 octave_base_value::type_conv_fcn cf2
53 = arg.numeric_conversion_function (); 53 = arg.numeric_conversion_function ();
54 54
55 if (cf) 55 if (cf2)
56 { 56 {
57 octave_base_value *tmp (cf (*(arg.internal_rep ()))); 57 octave_base_value *tmp (cf2 (*(arg.internal_rep ())));
58 58
59 if (tmp) 59 if (tmp)
60 { 60 {
61 octave_value xarg (tmp); 61 octave_value xarg (tmp);
62 62