From 6eb3bb273d41fc53006e8c0c042433d41bdcb294 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 12 May 1998 21:42:34 +0000 Subject: error.c (dump_simple_decl): Use DECL_CLASS_SCOPE_P and/or DECL_NAMESPACE_SCOPE_P. * error.c (dump_simple_decl): Use DECL_CLASS_SCOPE_P and/or DECL_NAMESPACE_SCOPE_P. (lang_decl_name): Likewise. * pt.c (tsubst_friend_function, tsubst): Likewise. * decl.c (pushdecl, redeclaration_error_message, start_decl, cp_finish_decl, start_function): Likewise. * class.c (finish_struct_1): Likewise. * call.c (build_over_call): Likewise. (compare_ics): Use DERIVED_FROM_P. From-SVN: r19705 --- gcc/cp/cp-tree.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gcc/cp/cp-tree.h') diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index d02c7e7..3461bdb 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -1106,12 +1106,12 @@ struct lang_decl ? DECL_CLASS_CONTEXT (NODE) : DECL_CONTEXT (NODE)) /* 1 iff NODE has namespace scope, including the global namespace. */ -#define DECL_NAMESPACE_SCOPE(NODE) \ +#define DECL_NAMESPACE_SCOPE_P(NODE) \ (DECL_CONTEXT (NODE) == NULL_TREE \ || TREE_CODE (DECL_CONTEXT (NODE)) == NAMESPACE_DECL) /* 1 iff NODE is a class member. */ -#define DECL_CLASS_SCOPE(NODE) \ +#define DECL_CLASS_SCOPE_P(NODE) \ (DECL_CONTEXT (NODE) \ && TREE_CODE_CLASS (TREE_CODE (DECL_CONTEXT (NODE))) == 't') -- cgit v1.1