cp-tree.h (TYPE_NAMESPACE_SCOPE_P, [...]): Remove.

	* cp/cp-tree.h (TYPE_NAMESPACE_SCOPE_P,
	TYPE_FUNCTION_SCOPE_P): Remove.

From-SVN: r120239

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5009eba..9f00936 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-27  Kazu Hirata  <kazu@codesourcery.com>
+
+       * cp/cp-tree.h (TYPE_NAMESPACE_SCOPE_P,
+       TYPE_FUNCTION_SCOPE_P): Remove.
+
 2006-12-21  Andrew Pinski  <pinskia@gmail.com>
 
        PR C++/30225

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 3968f96..6707a20 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -2002,9 +2002,6 @@ struct lang_decl GTY(())
   (!DECL_TEMPLATE_PARM_P (NODE)                                        \
    && TREE_CODE (CP_DECL_CONTEXT (NODE)) == NAMESPACE_DECL)
 
-#define TYPE_NAMESPACE_SCOPE_P(NODE)                           \
-  (TREE_CODE (CP_TYPE_CONTEXT (NODE)) == NAMESPACE_DECL)
-
 /* 1 iff NODE is a class member.  */
 #define DECL_CLASS_SCOPE_P(NODE) \
   (DECL_CONTEXT (NODE) && TYPE_P (DECL_CONTEXT (NODE)))
@@ -2017,10 +2014,6 @@ struct lang_decl GTY(())
   (DECL_CONTEXT (NODE) \
    && TREE_CODE (DECL_CONTEXT (NODE)) == FUNCTION_DECL)
 
-#define TYPE_FUNCTION_SCOPE_P(NODE) \
-  (TYPE_CONTEXT (NODE) \
-   && TREE_CODE (TYPE_CONTEXT (NODE)) == FUNCTION_DECL)
-
 /* 1 iff VAR_DECL node NODE is a type-info decl.  This flag is set for
    both the primary typeinfo object and the associated NTBS name.  */
 #define DECL_TINFO_P(NODE) TREE_LANG_FLAG_4 (VAR_DECL_CHECK (NODE))