diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-08 21:03:59 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-08 21:03:59 +0000 |
| commit | 02f3736886d5dba5678134cc797bb131b7f25230 (patch) | |
| tree | 3feb6a51b02bcf2caac0a83cb58065f8ddfba6fe | |
| parent | c2a54b6ea365e8105b75f34d32ea417d6c93b144 (diff) | |
fix thinko in last change
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-2_95-branch@28600 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9269af0ab56..bfebb6e241b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -3,6 +3,9 @@ * decl.c (bad_specifiers): It's OK to have an EH spec on a function pointer. + * pt.c (maybe_get_template_decl_from_type_decl): Make sure that + we're looking at a class. + * decl.c (lookup_name_real): Set the complain flag if we're looking for a namespace member. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0a4e20693d5..47fa99a5c43 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3574,6 +3574,7 @@ maybe_get_template_decl_from_type_decl (decl) return (decl != NULL_TREE && TREE_CODE (decl) == TYPE_DECL && DECL_ARTIFICIAL (decl) + && CLASS_TYPE_P (TREE_TYPE (decl)) && CLASSTYPE_TEMPLATE_INFO (TREE_TYPE (decl))) ? CLASSTYPE_TI_TEMPLATE (TREE_TYPE (decl)) : decl; } |