r194253 - in /branches/gcc-4_7-branch/gcc: cp/C...

[jason@gcc.gnu.org]

Author: jason
Date: Thu Dec  6 14:39:52 2012
New Revision: 194253

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=194253
Log:
	PR c++/55015
	PR c++/53821
	* semantics.c (maybe_add_lambda_conv_op): Revert earlier change.
	* decl.c (start_preparsed_function): Make local class methods comdat
	in templates, too.

Added:
    branches/gcc-4_7-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv6.C
Modified:
    branches/gcc-4_7-branch/gcc/cp/ChangeLog
    branches/gcc-4_7-branch/gcc/cp/decl.c
    branches/gcc-4_7-branch/gcc/cp/semantics.c