error.c (dump_decl): Use CP_DECL_CONTEXT, not DECL_CONTEXT, when comparing with globa...

	* error.c (dump_decl): Use CP_DECL_CONTEXT, not DECL_CONTEXT, when
	comparing with global_namespace.
	(dump_aggr_type): Likewise.

From-SVN: r22105

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 359516b1a8c53ec49b8e6c85b41c546efc8e39c9..cba78ab6aff6c3d0cef071b6d277209f5047d839 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 1998-08-30  Mark Mitchell  <mark@markmitchell.com>
 
+       * error.c (dump_decl): Use CP_DECL_CONTEXT, not DECL_CONTEXT, when
+       comparing with global_namespace.
+       (dump_aggr_type): Likewise.
+
        * decl.c (grokfndecl): Issue error on declaration of friend
        templates with explicit template arguments.
 

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index bd459c2a6f82d19bebb1f5a0653e44f4d233974a..dd3f952356230ab6a8b43d01a766b04311d040c1 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -352,7 +352,7 @@ dump_aggr_type (t, v, canonical_name)
   
   name = TYPE_NAME (canonical_name ? TYPE_MAIN_VARIANT (t) : t);
 
-  if (name && DECL_CONTEXT (name) && DECL_CONTEXT (name) != global_namespace)
+  if (name && CP_DECL_CONTEXT (name) != global_namespace)
     {
       /* FUNCTION_DECL or RECORD_TYPE */
       dump_decl (DECL_CONTEXT (name), 0);
@@ -728,7 +728,7 @@ dump_decl (t, v)
       break;
 
     case NAMESPACE_DECL:
-      if (DECL_CONTEXT (t) != global_namespace)
+      if (CP_DECL_CONTEXT (t) != global_namespace)
        {
          dump_decl (DECL_CONTEXT (t), v);
          OB_PUTC2 (':',':');