r167559 - in /branches/gcc-4_4-branch/gcc: cp/C...

[jakub@gcc.gnu.org]

Author: jakub
Date: Tue Dec  7 18:58:18 2010
New Revision: 167559

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=167559
Log:
	Backport from mainline
	2010-11-20  Jakub Jelinek  <jakub@redhat.com>
 
	PR c++/46538
	* decl.c (cp_make_fname_decl): Return error_mark_node if
	current_binding_level has already sk_function_parms kind.

	* g++.dg/other/error34.C: New test.

Added:
    branches/gcc-4_4-branch/gcc/testsuite/g++.dg/other/error34.C
Modified:
    branches/gcc-4_4-branch/gcc/cp/ChangeLog
    branches/gcc-4_4-branch/gcc/cp/decl.c
    branches/gcc-4_4-branch/gcc/testsuite/ChangeLog