From 9a801c3884c8e8c8e4e2294c3e882d0b9f4e632c Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Fri, 2 Oct 2009 02:21:01 +0000 Subject: decl.c (grokdeclarator): Set constexprness before announcing friendship. * decl.c (grokdeclarator): Set constexprness before announcing friendship. Co-Authored-By: Jason Merrill From-SVN: r152393 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'gcc') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fbe0637..31e1ac6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-10-01 Gabriel Dos Reis + Jason Merrill + + * decl.c (grokdeclarator): Set constexprness before announcing + friendship. + 2009-10-01 Gabriel Dos Reis * decl.c (record_builtin_java_type): Undo unintended change. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 5d3ff9d..5eb389f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -9299,10 +9299,10 @@ grokdeclarator (const cp_declarator *declarator, return error_mark_node; } + DECL_DECLARED_CONSTEXPR_P (decl) = constexpr_p; decl = do_friend (ctype, unqualified_id, decl, *attrlist, flags, funcdef_flag); - DECL_DECLARED_CONSTEXPR_P (decl) = constexpr_p; return decl; } else -- cgit v1.1