r194251 - in /trunk/gcc: cp/ChangeLog cp/decl.c...

[jason@gcc.gnu.org]

Author: jason
Date: Thu Dec  6 14:37:13 2012
New Revision: 194251

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=194251
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:
    trunk/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv6.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/decl.c
    trunk/gcc/cp/semantics.c