PR c++/43856

	* name-lookup.c (qualify_lookup): Disqualify lambda op().
	* class.c (current_nonlambda_class_type): New fn.
	* semantics.c (nonlambda_method_basetype): New.
	* cp-tree.h: Declare them.
	* tree.c (maybe_dummy_object): Handle implicit 'this' capture.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158807 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4e6a008..36dfe71 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,12 @@
 2010-04-27  Jason Merrill  <jason@redhat.com>
 
+       PR c++/43856
+       * name-lookup.c (qualify_lookup): Disqualify lambda op().
+       * class.c (current_nonlambda_class_type): New fn.
+       * semantics.c (nonlambda_method_basetype): New.
+       * cp-tree.h: Declare them.
+       * tree.c (maybe_dummy_object): Handle implicit 'this' capture.
+
        * semantics.c (baselink_for_fns): Correct BASELINK_BINFO.
 
        PR c++/43875

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e991ba0..dbc95e4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-27  Jason Merrill  <jason@redhat.com>
 
+       PR c++/43856
+       * g++.dg/cpp0x/lambda/lambda-this2.C: New.
+
        PR c++/43875
        * g++.dg/cpp0x/lambda/lambda-deduce2.C: New.
 

diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this2.C
index 04fe474..ce4bda4 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this2.C
@@ -10,7 +10,6 @@ struct S1 {
     [=]() {
       i;
       g();
-      S1::g();
       operator()(42);
     };
   }