aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2015-02-13 14:54:48 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2015-02-13 14:54:48 +0000
commit81adbcea49c3dbc5bb1fe4211e113a9141d13263 (patch)
tree4c1ad077c7b21025e1bc44dee91749b2d1617b6d /gcc/cp
parent730f474bf90d59582144b23c9176276ab680ef56 (diff)
downloadgcc-81adbcea49c3dbc5bb1fe4211e113a9141d13263.zip
gcc-81adbcea49c3dbc5bb1fe4211e113a9141d13263.tar.gz
gcc-81adbcea49c3dbc5bb1fe4211e113a9141d13263.tar.bz2
re PR c++/64970 (Hard error instead of SFINAE for expression in nested template alias)
/cp 2015-02-13 Paolo Carlini <paolo.carlini@oracle.com> PR c++/64970 * decl.c (make_typename_type): Pass tsubst_flags_t argument to lookup_template_class. /testsuite 2015-02-13 Paolo Carlini <paolo.carlini@oracle.com> PR c++/64970 * g++.dg/cpp0x/sfinae55.C: New. From-SVN: r220684
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/decl.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8132e2f..a39acaa 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-13 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/64970
+ * decl.c (make_typename_type): Pass tsubst_flags_t argument
+ to lookup_template_class.
+
2015-02-13 Jakub Jelinek <jakub@redhat.com>
PR ipa/65034
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index f95a61a..bc481bf 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3569,7 +3569,7 @@ make_typename_type (tree context, tree name, enum tag_types tag_type,
return lookup_template_class (t, TREE_OPERAND (fullname, 1),
NULL_TREE, context,
/*entering_scope=*/0,
- tf_warning_or_error | tf_user);
+ complain | tf_user);
if (DECL_ARTIFICIAL (t) || !(complain & tf_keep_type_decl))
t = TREE_TYPE (t);