[SCM] archer-ratmice-compile-Wc++-compat: rename "typename", "operator", "template" variables. gdbtypes.c: rename "typename" variables. ia64-tdep.c: rename "template" variables. valarith.c: rename "operator" variables.

[SCM] archer-ratmice-compile-Wc++-compat: rename "typename", "operator", "template" variables. gdbtypes.c: rename "typename" variables. ia64-tdep.c: rename "template" variables. valarith.c: rename "operator" variables.

[ratmice]

The branch, archer-ratmice-compile-Wc++-compat has been updated
       via  07cac3aae40f7ea8594d18eca62222a6c50666b6 (commit)
      from  cf552177433d3b76613c43c2fe31d5216818c098 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 07cac3aae40f7ea8594d18eca62222a6c50666b6
Author: matt rice <ratmice@gmail.com>
Date:   Thu Sep 16 03:09:23 2010 -0700

    rename "typename", "operator", "template" variables.
    gdbtypes.c: rename "typename" variables.
    ia64-tdep.c: rename "template" variables.
    valarith.c: rename "operator" variables.

-----------------------------------------------------------------------

Summary of changes:
 gdb/gdbtypes.c  |   14 +++++++-------
 gdb/ia64-tdep.c |   30 +++++++++++++++---------------
 gdb/valarith.c  |    8 ++++----
 3 files changed, 26 insertions(+), 26 deletions(-)

First 500 lines of diff:
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index f079f3b..947a2d8 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -1216,7 +1216,7 @@ struct type *
 lookup_struct_elt_type (struct type *type, char *name, int noerr)
 {
   int i;
-  char *typename;
+  char *type_name;
 
   for (;;)
     {
@@ -1230,9 +1230,9 @@ lookup_struct_elt_type (struct type *type, char *name, int noerr)
   if (TYPE_CODE (type) != TYPE_CODE_STRUCT 
       && TYPE_CODE (type) != TYPE_CODE_UNION)
     {
-      typename = type_to_string (type);
-      make_cleanup (xfree, typename);
-      error (_("Type %s is not a structure or union type."), typename);
+      type_name = type_to_string (type);
+      make_cleanup (xfree, type_name);
+      error (_("Type %s is not a structure or union type."), type_name);
     }
 
 #if 0
@@ -1284,9 +1284,9 @@ lookup_struct_elt_type (struct type *type, char *name, int noerr)
       return NULL;
     }
 
-  typename = type_to_string (type);
-  make_cleanup (xfree, typename);
-  error (_("Type %s has no component named %s."), typename, name);
+  type_name = type_to_string (type);
+  make_cleanup (xfree, type_name);
+  error (_("Type %s has no component named %s."), type_name, name);
 }
 
 /* Lookup the vptr basetype/fieldno values for TYPE.
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index af64638..6f149f6 100644
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -504,7 +504,7 @@ fetch_instruction (CORE_ADDR addr, instruction_type *it, long long *instr)
 {
   char bundle[BUNDLE_LEN];
   int slotnum = (int) (addr & 0x0f) / SLOT_MULTIPLIER;
-  long long template;
+  long long templatenum;
   int val;
 
   /* Warn about slot numbers greater than 2.  We used to generate
@@ -535,8 +535,8 @@ fetch_instruction (CORE_ADDR addr, instruction_type *it, long long *instr)
     return 0;
 
   *instr = slotN_contents (bundle, slotnum);
-  template = extract_bit_field (bundle, 0, 5);
-  *it = template_encoding_table[(int)template][slotnum];
+  templatenum = extract_bit_field (bundle, 0, 5);
+  *it = template_encoding_table[(int)templatenum][slotnum];
 
   if (slotnum == 2 || (slotnum == 1 && *it == L))
     addr += 16;
@@ -634,7 +634,7 @@ ia64_memory_insert_breakpoint (struct gdbarch *gdbarch,
   int slotnum = (int) (addr & 0x0f) / SLOT_MULTIPLIER, shadow_slotnum;
   long long instr_breakpoint;
   int val;
-  int template;
+  int templatenum;
   struct cleanup *cleanup;
 
   if (slotnum > 2)
@@ -663,8 +663,8 @@ ia64_memory_insert_breakpoint (struct gdbarch *gdbarch,
      a breakpoint on an L-X instruction.  */
   bp_tgt->shadow_len = BUNDLE_LEN - shadow_slotnum;
 
-  template = extract_bit_field (bundle, 0, 5);
-  if (template_encoding_table[template][slotnum] == X)
+  templatenum = extract_bit_field (bundle, 0, 5);
+  if (template_encoding_table[templatenum][slotnum] == X)
     {
       /* X unit types can only be used in slot 2, and are actually
 	 part of a 2-slot L-X instruction.  We cannot break at this
@@ -673,7 +673,7 @@ ia64_memory_insert_breakpoint (struct gdbarch *gdbarch,
       gdb_assert (slotnum == 2);
       error (_("Can't insert breakpoint for non-existing slot X"));
     }
-  if (template_encoding_table[template][slotnum] == L)
+  if (template_encoding_table[templatenum][slotnum] == L)
     {
       /* L unit types can only be used in slot 1.  But the associated
 	 opcode for that instruction is in slot 2, so bump the slot number
@@ -730,7 +730,7 @@ ia64_memory_remove_breakpoint (struct gdbarch *gdbarch,
   int slotnum = (addr & 0x0f) / SLOT_MULTIPLIER, shadow_slotnum;
   long long instr_breakpoint, instr_saved;
   int val;
-  int template;
+  int templatenum;
   struct cleanup *cleanup;
 
   addr &= ~0x0f;
@@ -752,8 +752,8 @@ ia64_memory_remove_breakpoint (struct gdbarch *gdbarch,
      for addressing the SHADOW_CONTENTS placement.  */
   shadow_slotnum = slotnum;
 
-  template = extract_bit_field (bundle_mem, 0, 5);
-  if (template_encoding_table[template][slotnum] == X)
+  templatenum = extract_bit_field (bundle_mem, 0, 5);
+  if (template_encoding_table[templatenum][slotnum] == X)
     {
       /* X unit types can only be used in slot 2, and are actually
 	 part of a 2-slot L-X instruction.  We refuse to insert
@@ -767,7 +767,7 @@ ia64_memory_remove_breakpoint (struct gdbarch *gdbarch,
       do_cleanups (cleanup);
       return -1;
     }
-  if (template_encoding_table[template][slotnum] == L)
+  if (template_encoding_table[templatenum][slotnum] == L)
     {
       /* L unit types can only be used in slot 1.  But the breakpoint
 	 was actually saved using slot 2, so update the slot number
@@ -819,7 +819,7 @@ ia64_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr)
   int slotnum = (int) (*pcptr & 0x0f) / SLOT_MULTIPLIER, shadow_slotnum;
   long long instr_fetched;
   int val;
-  int template;
+  int templatenum;
   struct cleanup *cleanup;
 
   if (slotnum > 2)
@@ -847,13 +847,13 @@ ia64_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr)
 
   /* Check for L type instruction in slot 1, if present then bump up the slot
      number to the slot 2.  */
-  template = extract_bit_field (bundle, 0, 5);
-  if (template_encoding_table[template][slotnum] == X)
+  templatenum = extract_bit_field (bundle, 0, 5);
+  if (template_encoding_table[templatenum][slotnum] == X)
     {
       gdb_assert (slotnum == 2);
       error (_("Can't insert breakpoint for non-existing slot X"));
     }
-  if (template_encoding_table[template][slotnum] == L)
+  if (template_encoding_table[templatenum][slotnum] == L)
     {
       gdb_assert (slotnum == 1);
       slotnum = 2;
diff --git a/gdb/valarith.c b/gdb/valarith.c
index d75fdd2..ca26739 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -320,7 +320,7 @@ unop_user_defined_p (enum exp_opcode op, struct value *arg1)
     }
 }
 
-/* Try to find an operator named OPERATOR which takes NARGS arguments
+/* Try to find an operator named OP which takes NARGS arguments
    specified in ARGS.  If the operator found is a static member operator
    *STATIC_MEMFUNP will be set to 1, and otherwise 0.
    The search if performed through find_overload_match which will handle
@@ -329,7 +329,7 @@ unop_user_defined_p (enum exp_opcode op, struct value *arg1)
    situations or combinations thereof.  */
 
 static struct value *
-value_user_defined_cpp_op (struct value **args, int nargs, char *operator,
+value_user_defined_cpp_op (struct value **args, int nargs, char *op,
                            int *static_memfuncp)
 {
 
@@ -343,7 +343,7 @@ value_user_defined_cpp_op (struct value **args, int nargs, char *operator,
   for (i = 0; i < nargs; i++)
     arg_types[i] = value_type (args[i]);
 
-  find_overload_match (arg_types, nargs, operator, BOTH /* could be method */,
+  find_overload_match (arg_types, nargs, op, BOTH /* could be method */,
                        0 /* strict match */, &args[0], /* objp */
                        NULL /* pass NULL symbol since symbol is unknown */,
                        &valp, &symp, static_memfuncp, 0);
@@ -360,7 +360,7 @@ value_user_defined_cpp_op (struct value **args, int nargs, char *operator,
       return value_of_variable (symp, 0);
     }
 
-  error (_("Could not find %s."), operator);
+  error (_("Could not find %s."), op);
 }
 
 /* Lookup user defined operator NAME.  Return a value representing the


hooks/post-receive
--
Repository for Project Archer.