* error.c (dump_expr): Add 0x to printed hex numbers to make

[pf3gnuchains/gcc-fork.git] / gcc / cp / error.c

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index e687ac0..f836ecc 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1474,9 +1474,9 @@ dump_expr (tree t, int flags)
                /* Would "%x%0*x" or "%x%*0x" get zero-padding on all
                   systems?  */
                {
-                 static char format[10]; /* "%x%09999x\0" */
+                 static char format[12]; /* "0x%x%09999x\0" */
                  if (!format[0])
-                   sprintf (format, "%%x%%0%dx", HOST_BITS_PER_INT / 4);
+                   sprintf (format, "0x%%x%%0%dx", HOST_BITS_PER_INT / 4);
                  sprintf (digit_buffer, format, TREE_INT_CST_HIGH (val),
                           TREE_INT_CST_LOW (val));
                  output_add_string (scratch_buffer, digit_buffer);
@@ -2010,7 +2010,7 @@ dump_expr (tree t, int flags)
       break;
 
     case BASELINK:
-      print_tree_identifier (scratch_buffer, DECL_NAME (get_first_fn (t)));
+      dump_expr (get_first_fn (t), flags & ~TFF_EXPR_IN_PARENS);
       break;
 
       /* else fall through */