tree.c (debug_binfo): Make printf format match arguments.

1998-06-10  John Carr  <jfc@mit.edu>
	* tree.c (debug_binfo): Make printf format match arguments.
	* error.c (OB_PUTI): Make printf format match arguments.

From-SVN: r20401

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c84e3e204d139d10028c90c7d254f6f9d5d5073f..37ebb1b2cb2d7f50fa564a2a2a9e37de946be84d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+1998-06-10  John Carr  <jfc@mit.edu>
+
+       * tree.c (debug_binfo): Make printf format match arguments.
+
+       * error.c (OB_PUTI): Make printf format match arguments.
+
 1998-06-10  Jason Merrill  <jason@yorick.cygnus.com>
 
        * init.c (resolve_offset_ref): Handle default-initialization.

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 2c77eff44e799d46196785446e052fed4ef2d7e1..4862d64894c02d95e0f7d31b674666abf23124e1 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -80,7 +80,7 @@ static char *scratch_firstobj;
                 IDENTIFIER_LENGTH (ID)))
 # define OB_PUTCP(S) (obstack_grow (&scratch_obstack, (S), strlen (S)))
 # define OB_FINISH() (obstack_1grow (&scratch_obstack, '\0'))
-# define OB_PUTI(CST) do { sprintf (digit_buffer, "%d", (CST)); \
+# define OB_PUTI(CST) do { sprintf (digit_buffer, HOST_WIDE_INT_PRINT_DEC, (HOST_WIDE_INT)(CST)); \
                           OB_PUTCP (digit_buffer); } while (0)
 # define OB_UNPUT(N) obstack_blank (&scratch_obstack, - (N));
 

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 6e5996f60d48a44220186269213a4729632edbd6..617c4cf5ebcd7a04bc14f510dabf1aa1c432feac 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1250,9 +1250,9 @@ debug_binfo (elem)
   unsigned HOST_WIDE_INT n;
   tree virtuals;
 
-  fprintf (stderr, "type \"%s\"; offset = %d\n",
+  fprintf (stderr, "type \"%s\"; offset = %ld\n",
           TYPE_NAME_STRING (BINFO_TYPE (elem)),
-          TREE_INT_CST_LOW (BINFO_OFFSET (elem)));
+          (long) TREE_INT_CST_LOW (BINFO_OFFSET (elem)));
   fprintf (stderr, "vtable type:\n");
   debug_tree (BINFO_TYPE (elem));
   if (BINFO_VTABLE (elem))
@@ -1267,9 +1267,9 @@ debug_binfo (elem)
   while (virtuals)
     {
       tree fndecl = TREE_OPERAND (FNADDR_FROM_VTABLE_ENTRY (TREE_VALUE (virtuals)), 0);
-      fprintf (stderr, "%s [%d =? %d]\n",
+      fprintf (stderr, "%s [%ld =? %ld]\n",
               IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (fndecl)),
-              n, TREE_INT_CST_LOW (DECL_VINDEX (fndecl)));
+              (long) n, (long) TREE_INT_CST_LOW (DECL_VINDEX (fndecl)));
       ++n;
       virtuals = TREE_CHAIN (virtuals);
     }