Mercurial > octave-nkf

changeset 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 277218396978
children 69c5cce38c29
files src/ChangeLog src/ov-type-conv.h
diffstat 2 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Oct 06 13:31:56 2008 -0400
+++ b/src/ChangeLog	Mon Oct 06 14:12:09 2008 -0400
@@ -1,3 +1,8 @@
+2008-10-06  John W. Eaton  <jwe@octave.org>
+
+	* ov-type-conv.h (octave_type_conv_body): Avoid shadow warning
+	from GCC.
+
 2008-10-06  David Bateman  <dbateman@free.fr>
 
 	* graphics.cc (static bool is_handle (const octave_value&)): Delete.
--- a/src/ov-type-conv.h	Mon Oct 06 13:31:56 2008 -0400
+++ b/src/ov-type-conv.h	Mon Oct 06 14:12:09 2008 -0400
@@ -33,12 +33,12 @@
     }
   else
     {
-      octave_base_value::type_conv_fcn cf
+      octave_base_value::type_conv_fcn cf1
         = octave_value_typeinfo::lookup_type_conv_op (t_arg, t_result);
        
-      if (cf)
+      if (cf1)
         {
-          octave_base_value *tmp (cf (*(arg.internal_rep ())));
+          octave_base_value *tmp (cf1 (*(arg.internal_rep ())));
 
           if (tmp)
             {
@@ -49,12 +49,12 @@
         }
       else
         {
-          octave_base_value::type_conv_fcn cf
+          octave_base_value::type_conv_fcn cf2
             = arg.numeric_conversion_function ();
 
-          if (cf)
+          if (cf2)
             {
-              octave_base_value *tmp (cf (*(arg.internal_rep ())));
+              octave_base_value *tmp (cf2 (*(arg.internal_rep ())));
 
               if (tmp)
                 {