RE: [cdt-patch] Fix for bug 36865 + some STL failed tests

["Amer, Hoda" <hamer@xxxxxxxxxxxx>]

Title: Fix for bug 36865 + some STL failed tests

 

Patch has been updated.

 

Thanks,

Hoda

 

-----Original Message-----
From: Camelon, John
Sent: Thursday, April 24, 2003 5:11 PM
To: Amer, Hoda
Subject: RE: [cdt-patch] Fix for bug 36865 + some STL failed tests

 

Please update and resend the UI-Tests portion of your patch to me. 

Thanks

JohnC

-----Original Message-----
From: Amer, Hoda [mailto:hamer@xxxxxxxxxxxx]
Sent: Thursday, April 24, 2003 4:57 PM
To: 'cdt-patch@xxxxxxxxxxx '
Cc: Amer, Hoda
Subject: [cdt-patch] Fix for bug 36865 + some STL failed tests

 

Fix for bug : const & volatile modifier missing from pointer to function signature 
+ 2 more STLFailedtests

Thanks,
Hoda

Index: failures/org/eclipse/cdt/core/parser/failedTests/STLFailedTests.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui.tests/failures/org/eclipse/cdt/core/parser/failedTests/STLFailedTests.java,v
retrieving revision 1.2
diff -u -r1.2 STLFailedTests.java
--- failures/org/eclipse/cdt/core/parser/failedTests/STLFailedTests.java	24 Apr 2003 21:01:24 -0000	1.2
+++ failures/org/eclipse/cdt/core/parser/failedTests/STLFailedTests.java	25 Apr 2003 13:55:01 -0000
@@ -49,4 +49,14 @@
 		code.write("{}\n");
 		failTest(code.toString());
 	}
+	
+	public void testBug36805() throws Exception{
+		Writer code = new StringWriter();
+		code.write("__STL_BEGIN_NAMESPACE\n");
+		code.write("template <class _CharT> class char_traits\n");
+		code.write(": public __char_traits_base<_CharT, _CharT>\n");
+		code.write("{};\n");
+		failTest(code.toString());
+	}
+	
 }

Index: parser/org/eclipse/cdt/internal/core/model/CModelBuilder.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/model/CModelBuilder.java,v
retrieving revision 1.19
diff -u -r1.19 CModelBuilder.java
--- parser/org/eclipse/cdt/internal/core/model/CModelBuilder.java	21 Apr 2003 20:02:58 -0000	1.19
+++ parser/org/eclipse/cdt/internal/core/model/CModelBuilder.java	25 Apr 2003 13:54:36 -0000
@@ -638,9 +638,17 @@
 		type.append(getDeclarationType(declaration));
 		// add pointerr or reference from declarator if any
 		type.append(getDeclaratorPointerOperation(declarator));
-		// pointer to function or array of functions
-		if(declarator.getDeclarator() != null)
-		type.append("(*)");
+		if(declarator.getDeclarator() != null){
+			// pointer to function or array of functions
+			type.append("(");
+			// add pointerr or reference from declarator if any
+			type.append(getDeclaratorPointerOperation(declarator.getDeclarator()));
+			type.append(")");
+		}
+		else {
+			// add pointerr or reference from declarator if any
+			type.append(getDeclaratorPointerOperation(declarator));
+		}
 		// arrays
 		type.append(getDeclaratorArrayQualifiers(declarator));
 		return type.toString();