diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 7eb5fa41251..20bd44404ee 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-07 Alain Magloire
+
+	Using a complete parser is to heavy for the typeInfo
+	falling back to structural.
+
+	* browser/org/eclipse/cdt/internal/core/browser/cache/TypeMatchLocator.java
+
 2004-04-06 Alain Magloire
 
 	Cache the values in the info.
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeMatchLocator.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeMatchLocator.java
index e20b01c0270..1d7df8b2dda 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeMatchLocator.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeMatchLocator.java
@@ -315,7 +315,7 @@ public class TypeMatchLocator implements ISourceElementRequestor, ICSearchConsta
 		
 		IResource resource= null;
 		IPath path= null;
-		Object obj= (Object) resourceStack.top();
+		Object obj= resourceStack.top();
 		if (obj instanceof IResource)
 			resource= (IResource) obj;
 		else
@@ -500,7 +500,7 @@ public class TypeMatchLocator implements ISourceElementRequestor, ICSearchConsta
 		try
 		{
 			IScanner scanner = ParserFactory.createScanner( reader, realPath.toOSString(), scanInfo, ParserMode.COMPLETE_PARSE, language, this, ParserUtil.getScannerLogService() );
-			parser  = ParserFactory.createParser( scanner, this, ParserMode.COMPLETE_PARSE, language, ParserUtil.getParserLogService() );
+			parser  = ParserFactory.createParser( scanner, this, ParserMode.STRUCTURAL_PARSE, language, ParserUtil.getParserLogService() );
 		}
 		catch( ParserFactoryError pfe )
 		{