Sophie

Sophie

distrib > Fedora > 14 > x86_64 > by-pkgid > f703f6cc8228e4e780f34b02d5eed091 > files > 17

insight-6.8.1-3.fc14.src.rpm

diff -Naur insight-6.8-1.orig/gdb/ada-lang.c insight-6.8-1.new/gdb/ada-lang.c
--- insight-6.8-1.orig/gdb/ada-lang.c	2008-02-07 23:27:53.000000000 +0100
+++ insight-6.8-1.new/gdb/ada-lang.c	2010-09-27 19:55:53.000000000 +0200
@@ -7683,7 +7683,7 @@
 const char *
 ada_attribute_name (enum exp_opcode n)
 {
-  if (n >= OP_ATR_FIRST && n <= (int) OP_ATR_VAL)
+  if (n >= (enum exp_opcode) OP_ATR_FIRST && n <= (int) OP_ATR_VAL)
     return attribute_names[n - OP_ATR_FIRST + 1];
   else
     return attribute_names[0];
@@ -8183,7 +8183,7 @@
       elt = ada_to_fixed_value (unwrap_value (elt));
     }
 
-  if (exp->elts[*pos].opcode == OP_AGGREGATE)
+  if (exp->elts[*pos].opcode == (enum exp_opcode) OP_AGGREGATE)
     assign_aggregate (container, elt, exp, pos, EVAL_NORMAL);
   else
     value_assign_to_component (container, elt, 
@@ -8338,7 +8338,7 @@
     {
       LONGEST lower, upper;
       enum exp_opcode op = exp->elts[choice_pos].opcode;
-      if (op == OP_DISCRETE_RANGE)
+      if (op == (enum exp_opcode) OP_DISCRETE_RANGE)
 	{
 	  choice_pos += 1;
 	  lower = value_as_long (ada_evaluate_subexp (NULL, exp, pos,
@@ -8537,7 +8537,7 @@
 
     case BINOP_ASSIGN:
       arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
-      if (exp->elts[*pos].opcode == OP_AGGREGATE)
+      if (exp->elts[*pos].opcode == (enum exp_opcode) OP_AGGREGATE)
 	{
 	  arg1 = assign_aggregate (arg1, arg1, exp, pos, noside);
 	  if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
@@ -9096,7 +9096,7 @@
         return value_zero (value_type (arg1), not_lval);
       else
         return value_binop (arg1, arg2,
-                            op == OP_ATR_MIN ? BINOP_MIN : BINOP_MAX);
+                            op == (enum exp_opcode) OP_ATR_MIN ? BINOP_MIN : BINOP_MAX);
 
     case OP_ATR_MODULUS:
       {
diff -Naur insight-6.8-1.orig/gdb/cp-name-parser.y insight-6.8-1.new/gdb/cp-name-parser.y
--- insight-6.8-1.orig/gdb/cp-name-parser.y	2008-01-01 23:53:09.000000000 +0100
+++ insight-6.8-1.new/gdb/cp-name-parser.y	2010-09-27 19:21:11.000000000 +0200
@@ -1977,12 +1977,12 @@
   char *str, *prefix = NULL, *buf;
   size_t err = 0;
 
-  if (result->type == GLOBAL_DESTRUCTORS)
+  if (result->type == (enum demangle_component_type) GLOBAL_DESTRUCTORS)
     {
       result = d_left (result);
       prefix = "global destructors keyed to ";
     }
-  else if (result->type == GLOBAL_CONSTRUCTORS)
+  else if (result->type == (enum demangle_component_type) GLOBAL_CONSTRUCTORS)
     {
       result = d_left (result);
       prefix = "global constructors keyed to ";