From 678048254b98d983be685f344e25575c2c23dc8d Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 4 Sep 2000 11:18:03 +0000 Subject: [PATCH] * init.c (resolve_offset_ref): Deal with TEMPLATE_ID_EXPR. From-SVN: r36136 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/init.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c99b9a01fcb6..2a5d960278d2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2000-09-04 Nathan Sidwell + + * init.c (resolve_offset_ref): Deal with TEMPLATE_ID_EXPR. + 2000-09-04 Nathan Sidwell * pt.c (lookup_template_class): Remove abort. diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 097deb7028b4..91449c173205 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1812,7 +1812,7 @@ resolve_offset_ref (exp) base = current_class_ref; } - if (BASELINK_P (member)) + if (BASELINK_P (member) || TREE_CODE (member) == TEMPLATE_ID_EXPR) return build_unary_op (ADDR_EXPR, exp, 0); if (TREE_CODE (TREE_TYPE (member)) == METHOD_TYPE) @@ -1824,7 +1824,7 @@ resolve_offset_ref (exp) return build_unary_op (ADDR_EXPR, exp, 0); } - + if ((TREE_CODE (member) == VAR_DECL && ! TYPE_PTRMEMFUNC_P (TREE_TYPE (member)) && ! TYPE_PTRMEM_P (TREE_TYPE (member))) -- 2.47.2