diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-07-22 19:43:21 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-07-22 19:43:21 +0000 |
| commit | c0baf7dea21ae49d302e2fa94210787a560336b4 (patch) | |
| tree | 35da72bfb98493f4ecb7dfac18b386d1dc11cbaa /gcc | |
| parent | c5f1a968a571e44c4b1028768ae29d85b9c41842 (diff) | |
| download | gcc-c0baf7dea21ae49d302e2fa94210787a560336b4.tar.gz | |
2013-07-22 Paolo Carlini <paolo.carlini@oracle.com>
* cp-tree.h (DERIVED_FROM_P): Pass tf_none to lookup_base, not
tf_warning_or_error.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@201145 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8f4d37577fd..862e8597086 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2013-07-22 Paolo Carlini <paolo.carlini@oracle.com> + + * cp-tree.h (DERIVED_FROM_P): Pass tf_none to lookup_base, not + tf_warning_or_error. + 2013-07-21 OndÅej BÃlka <neleai@seznam.cz> * class.c: Fix typos. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index a837d2275a3..459c0e27ef3 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) \ |