From fb4149396a6445e2cb9a16faa64c9b2231719955 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 22 Jul 2013 19:43:21 +0000 Subject: [PATCH] cp-tree.h (DERIVED_FROM_P): Pass tf_none to lookup_base, not tf_warning_or_error. 2013-07-22 Paolo Carlini * cp-tree.h (DERIVED_FROM_P): Pass tf_none to lookup_base, not tf_warning_or_error. From-SVN: r201145 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/cp-tree.h | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8f4d37577fd9..862e8597086c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2013-07-22 Paolo Carlini + + * cp-tree.h (DERIVED_FROM_P): Pass tf_none to lookup_base, not + tf_warning_or_error. + 2013-07-21 Ondřej Bílka * class.c: Fix typos. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index a837d2275a34..459c0e27ef30 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -1320,8 +1320,7 @@ enum languages { lang_c, lang_cplusplus, lang_java }; /* Nonzero iff TYPE is derived from PARENT. Ignores accessibility and ambiguity issues. */ #define DERIVED_FROM_P(PARENT, TYPE) \ - (lookup_base ((TYPE), (PARENT), ba_any, NULL, tf_warning_or_error)\ - != NULL_TREE) + (lookup_base ((TYPE), (PARENT), ba_any, NULL, tf_none) != NULL_TREE) /* Gives the visibility specification for a class type. */ #define CLASSTYPE_VISIBILITY(TYPE) \ -- 2.47.2