aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2010-07-21 10:37:56 -0400
committerJason Merrill <jason@gcc.gnu.org>2010-07-21 10:37:56 -0400
commit557165ae948664887ee1576206ec7308250c463f (patch)
tree691bc995b133a4ab10c86405c2fedb1be10218f1 /gcc/cp
parent75a75e91fdd362c68e552a9e2bb5c0469e4e70af (diff)
downloadgcc-557165ae948664887ee1576206ec7308250c463f.zip
gcc-557165ae948664887ee1576206ec7308250c463f.tar.gz
gcc-557165ae948664887ee1576206ec7308250c463f.tar.bz2
parser.c (cp_parser_init_declarator): Pass LOOKUP_NORMAL to cp_finish_decl.
* parser.c (cp_parser_init_declarator): Pass LOOKUP_NORMAL to cp_finish_decl. From-SVN: r162377
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/parser.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 04f9af7..2aebb11 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-21 Jason Merrill <jason@redhat.com>
+
+ * parser.c (cp_parser_init_declarator): Pass LOOKUP_NORMAL
+ to cp_finish_decl.
+
2010-07-20 Jeffrey Yasskin <jyasskin@google.com>
PR c++/44641
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 19a158f..3fd96fb 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -14089,7 +14089,7 @@ cp_parser_init_declarator (cp_parser* parser,
`explicit' constructor is OK. Otherwise, an
`explicit' constructor cannot be used. */
((is_direct_init || !is_initialized)
- ? 0 : LOOKUP_ONLYCONVERTING));
+ ? LOOKUP_NORMAL : LOOKUP_IMPLICIT));
}
else if ((cxx_dialect != cxx98) && friend_p
&& decl && TREE_CODE (decl) == FUNCTION_DECL)