OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/19200 (Friend declaration misinterpreted as constructor)

Browse Source 
/cp
2014-06-11  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/19200
	* parser.c (cp_parser_init_declarator): Actually pass friend_p
	to cp_parser_declarator.

/testsuite
2014-06-11  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/19200
	* g++.dg/parse/friend11.C: New.

From-SVN: r211488
This commit is contained in:
Paolo Carlini 2014-06-12 01:29:42 +00:00 committed by Paolo Carlini
parent 8c80b86b05
commit e35889871c
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2014-06-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/19200
* parser.c (cp_parser_init_declarator): Actually pass friend_p
to cp_parser_declarator.
2014-06-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/60265

7
gcc/cp/parser.c
View File

@ -16545,7 +16545,7 @@ cp_parser_init_declarator (cp_parser* parser,
bool is_direct_init = false;
bool is_non_constant_init;
int ctor_dtor_or_conv_p;
bool friend_p;
bool friend_p = cp_parser_friend_p (decl_specifiers);
tree pushed_scope = NULL_TREE;
bool range_for_decl_p = false;
bool saved_default_arg_ok_p = parser->default_arg_ok_p;
@ -16574,7 +16574,7 @@ cp_parser_init_declarator (cp_parser* parser,
= cp_parser_declarator (parser, CP_PARSER_DECLARATOR_NAMED,
&ctor_dtor_or_conv_p,
/*parenthesized_p=*/NULL,
member_p, /*friend_p=*/false);
member_p, friend_p);
/* Gather up the deferred checks. */
stop_deferring_access_checks ();
@ -16746,9 +16746,6 @@ cp_parser_init_declarator (cp_parser* parser,
decl_specifiers->type = integer_type_node;
}
/* Check to see whether or not this declaration is a friend. */
friend_p = cp_parser_friend_p (decl_specifiers);
/* Enter the newly declared entry in the symbol table. If we're
processing a declaration in a class-specifier, we wait until
after processing the initializer. */

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2014-06-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/19200
* g++.dg/parse/friend11.C: New.
2014-06-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/60265

6
gcc/testsuite/g++.dg/parse/friend11.C Normal file
View File

@ -0,0 +1,6 @@
// PR c++/19200
struct S {
struct T{};
template<typename> friend void S(T);
};