re PR c++/43016 ([C++0x] Inappropriate multiple definition error for lambda…

re PR c++/43016 ([C++0x] Inappropriate multiple definition error for lambda function when inside inline functions)

	PR c++/43016
	* decl.c (start_preparsed_function): Do defer nested functions.

From-SVN: r158095

gcc/cp/ChangeLog

 2010-04-07  Jason Merrill  <jason@redhat.com>
 
+	PR c++/43016
+	* decl.c (start_preparsed_function): Do defer nested functions.
+
 	PR c++/11094, DR 408
 	* cp-tree.h (VAR_HAD_UNKNOWN_BOUND, SET_VAR_HAD_UNKNOWN_BOUND): New.
 	* decl2.c (finish_static_data_member_decl): Set it.

gcc/cp/decl.c

@@ -12023,9 +12023,7 @@ start_preparsed_function (tree decl1, tree attrs, int flags)
 
       if ((DECL_DECLARED_INLINE_P (decl1)
 	   || DECL_TEMPLATE_INSTANTIATION (decl1))
-	  && ! DECL_INTERFACE_KNOWN (decl1)
-	  /* Don't try to defer nested functions for now.  */
-	  && ! decl_function_context (decl1))
+	  && ! DECL_INTERFACE_KNOWN (decl1))
 	DECL_DEFER_OUTPUT (decl1) = 1;
       else
 	DECL_INTERFACE_KNOWN (decl1) = 1;