@@ -4706,10 +4706,6 @@ get_vec_init_expr (tree t)
#define TYPE_PTRDATAMEM_P(NODE) \
(TREE_CODE (NODE) == OFFSET_TYPE)
-/* Returns true if NODE is a pointer or a reference. */
-#define INDIRECT_TYPE_P(NODE) \
- (TYPE_PTR_P (NODE) || TYPE_REF_P (NODE))
-
/* Returns true if NODE is an object type:
[basic.types]
@@ -686,6 +686,11 @@ extern void omp_clause_range_check_failed (const_tree, const char *, int,
#define TYPE_REF_P(NODE) \
(TREE_CODE (NODE) == REFERENCE_TYPE)
+/* Nonzero if TYPE represents a pointer or reference type.
+ Keep these checks in ascending code order. */
+#define INDIRECT_TYPE_P(NODE) \
+ (TYPE_PTR_P (NODE) || TYPE_REF_P (NODE))
+
/* Nonzero if TYPE represents a pointer or reference type.
(It should be renamed to INDIRECT_TYPE_P.) Keep these checks in
ascending code order. */
This patch moves INDIRECT_TYPE_P from cp/cp-tree.h to tree.h to unify POINTER_TYPE_P in tree.h to INDIRECT_TYPE_P, which are equivalent. gcc/cp/ChangeLog: * cp-tree.h (INDIRECT_TYPE_P): Remove. gcc/ChangeLog: * tree.h (INDIRECT_TYPE_P): Define. Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org> --- gcc/cp/cp-tree.h | 4 ---- gcc/tree.h | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-)