diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1a0029333cc..d8d2507d997 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2000-03-21 Mark Mitchell + * cp-tree.h (TI_SPEC_INFO): Remove. + (CLASSTYPE_TI_SPEC_INFO): Likewise. + * pt.c (process_partial_specialization): Likewise. + * class.c (build_base_field): Fix thinko in computation of binfo offsets. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index abf072ceadd..f9ee2fb301d 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -2139,7 +2139,6 @@ struct lang_decl #define TI_TEMPLATE(NODE) (TREE_PURPOSE (NODE)) #define TI_ARGS(NODE) (TREE_VALUE (NODE)) -#define TI_SPEC_INFO(NODE) (TREE_CHAIN (NODE)) #define TI_PENDING_TEMPLATE_FLAG(NODE) TREE_LANG_FLAG_1 (NODE) /* We use TREE_VECs to hold template arguments. If there is only one @@ -2230,7 +2229,6 @@ struct lang_decl #define DECL_TI_ARGS(NODE) TI_ARGS (DECL_TEMPLATE_INFO (NODE)) #define CLASSTYPE_TI_TEMPLATE(NODE) TI_TEMPLATE (CLASSTYPE_TEMPLATE_INFO (NODE)) #define CLASSTYPE_TI_ARGS(NODE) TI_ARGS (CLASSTYPE_TEMPLATE_INFO (NODE)) -#define CLASSTYPE_TI_SPEC_INFO(NODE) TI_SPEC_INFO (CLASSTYPE_TEMPLATE_INFO (NODE)) #define ENUM_TI_TEMPLATE(NODE) \ TI_TEMPLATE (ENUM_TEMPLATE_INFO (NODE)) #define ENUM_TI_ARGS(NODE) \ diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index abb9539439d..d4da8b2426e 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -2183,7 +2183,7 @@ process_partial_specialization (decl) /* We've already got this specialization. */ return decl; - DECL_TEMPLATE_SPECIALIZATIONS (maintmpl) = CLASSTYPE_TI_SPEC_INFO (type) + DECL_TEMPLATE_SPECIALIZATIONS (maintmpl) = tree_cons (inner_args, inner_parms, DECL_TEMPLATE_SPECIALIZATIONS (maintmpl)); TREE_TYPE (DECL_TEMPLATE_SPECIALIZATIONS (maintmpl)) = type;