Typeid for pointer to member, bug 242197.

2 files changed, 17 insertions, 1 deletions

diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
index 6125af78517..2cc949f3faa 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
@@ -5951,5 +5951,18 @@ public class AST2CPPTests extends AST2BaseTest {
 	public void testAdjustmentOfParameterTypes_Bug239975() throws Exception {
 		parseAndCheckBindings(getAboveComment(), ParserLanguage.CPP);
 	}
-
+	
+	//	class A {
+	//		public:
+	//			void m(int c);
+	//	};
+	//
+	//	void test(char c) {
+	//		void (A::* ptr2mem)(char);
+	//		ptr2mem= reinterpret_cast<void (A::*)(char)>(&A::m);
+	//      ptr2mem= (void (A::*)(int))(0); 
+	//	}
+	public void testTypeIdForPtrToMember_Bug242197() throws Exception {
+		parseAndCheckBindings(getAboveComment(), ParserLanguage.CPP);
+	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
index 676c11e93ae..0cca1f2668b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
@@ -2763,6 +2763,9 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
                 }
 
                 identifier= name();
+                if (identifier.getLastToken().getType() == IToken.tCOLONCOLON)
+                	throwBacktrack(identifier.getLastToken());
+                
                 endOffset= identifier.getLastToken().getEndOffset();
                 encounteredTypename= true;
                 break;