class.c (alter_access): Remove unused label.

        * class.c (alter_access): Remove unused label.  Add braces
        around empty else clause.
        * lex.c (yyprint): Fix argument to printf.

From-SVN: r18887

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ce98056..a6ee661 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+Sun Mar 29 00:47:32 1998  Jeffrey A Law  (law@cygnus.com)
+
+       * class.c (alter_access): Remove unused label.  Add braces
+       around empty else clause.
+
+       * lex.c (yyprint): Fix argument to printf.
+
 Sat Mar 28 17:43:52 1998  Mark Mitchell  <mmitchell@usa.net>
 
        * pt.c (tsubst): Clear TREE_USED for new FUNCTION_DECLs.

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 7440a8a..1fc4f2d 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -1321,15 +1321,16 @@ alter_access (t, fdecl, access)
                   IDENTIFIER_POINTER (DECL_NAME (fdecl)));
        }
       else
-       /* They're changing the access to the same thing they changed
-          it to before.  That's OK.  */
-       ;
+       {
+         /* They're changing the access to the same thing they changed
+            it to before.  That's OK.  */
+         ;
+       }
     }
   else
     {
       enforce_access (TYPE_BINFO (t), fdecl);
 
-    alter:
       DECL_ACCESS (fdecl) = tree_cons (t, access, DECL_ACCESS (fdecl));
       return 1;
     }

diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 719a1ca..aaaacc5 100644 (file)
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -910,7 +910,7 @@ yyprint (file, yychar, yylval)
       t = yylval.ttype;
       if (TREE_CODE (t) == TYPE_DECL || TREE_CODE (t) == TEMPLATE_DECL)
        {
-         fprintf (file, " `%s'", DECL_NAME (t));
+         fprintf (file, " `%s'", IDENTIFIER_POINTER (DECL_NAME (t)));
          break;
        }
       my_friendly_assert (TREE_CODE (t) == IDENTIFIER_NODE, 224);