diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 34996fc..cac8a1a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-11-02 Dodji Seketeli <dodji@redhat.com> + + * cp-tree.h (enum tsubst_flags)<tf_no_class_instantiations>: + Remove. + * pt.c (tsubst): Remove the use of tf_no_class_instantiations. + 2010-11-03 Jason Merrill <jason@redhat.com> PR c++/46277 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index b46959b..fc4772d 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3960,8 +3960,6 @@ enum tsubst_flags { conversion. */ tf_no_access_control = 1 << 7, /* Do not perform access checks, even when issuing other errors. */ - /* Do not instantiate classes (used by count_non_default_template_args). */ - tf_no_class_instantiations = 1 << 8, /* Convenient substitution flags combinations. */ tf_warning_or_error = tf_warning | tf_error }; diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 21366d9..ca2baeb 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -10878,8 +10878,7 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) But, such constructs have already been resolved by this point, so here CTX really should have complete type, unless it's a partial instantiation. */ - if (!(complain & tf_no_class_instantiations)) - ctx = complete_type (ctx); + ctx = complete_type (ctx); if (!COMPLETE_TYPE_P (ctx)) { if (complain & tf_error) |