From ea5c5cf0d90a3529d98c4f533de5ea9230cf9c96 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Wed, 17 Aug 2011 13:46:51 +0200
Subject: [PATCH] Bug 353281: Follow up.

---
 .../cdt/internal/core/dom/parser/c/CASTTranslationUnit.java | 3 +--
 .../cdt/internal/core/dom/parser/c/CStructMapper.java       | 3 +--
 .../eclipse/cdt/internal/core/dom/parser/c/CVisitor.java    | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTranslationUnit.java
index c8319e3dfe7..7d66e42775a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTranslationUnit.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTranslationUnit.java
@@ -20,7 +20,6 @@ import org.eclipse.cdt.core.dom.ast.IBinding;
 import org.eclipse.cdt.core.dom.ast.ICompositeType;
 import org.eclipse.cdt.core.dom.ast.IMacroBinding;
 import org.eclipse.cdt.core.dom.ast.IScope;
-import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.parser.ParserLanguage;
 import org.eclipse.cdt.core.parser.util.ArrayUtil;
 import org.eclipse.cdt.internal.core.dom.Linkage;
@@ -111,7 +110,7 @@ public class CASTTranslationUnit extends ASTTranslationUnit implements IASTAmbig
 	/**
 	 * Maps structs from the index into this AST.
 	 */
-	public IType mapToASTType(ICompositeType type) {
+	public ICompositeType mapToASTType(ICompositeType type) {
 		return fStructMapper.mapToAST(type);
 	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructMapper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructMapper.java
index 66cfa88a90f..daf5a78e4cb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructMapper.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructMapper.java
@@ -19,7 +19,6 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
 import org.eclipse.cdt.core.dom.ast.IBinding;
 import org.eclipse.cdt.core.dom.ast.ICompositeType;
-import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.parser.util.CharArrayMap;
 
 /**
@@ -56,7 +55,7 @@ public class CStructMapper {
 		fTranslationUnit= tu;
 	}
 
-	public IType mapToAST(ICompositeType type) {
+	public ICompositeType mapToAST(ICompositeType type) {
 		if (fStructs == null) {
 			fStructs= new CharArrayMap<IASTName>();
 			fTranslationUnit.accept(new Visitor());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
index c3fb65a4489..b2ee9350d7f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
@@ -607,9 +607,9 @@ public class CVisitor extends ASTQueries {
 	    }
 		
 		if (type != null && type instanceof ICompositeType) {
-			final ICompositeType ct = (ICompositeType) type;
-			if (type instanceof IIndexBinding) {
-				type= ((CASTTranslationUnit) fieldReference.getTranslationUnit()).mapToASTType(ct);
+			ICompositeType ct = (ICompositeType) type;
+			if (ct instanceof IIndexBinding) {
+				ct= ((CASTTranslationUnit) fieldReference.getTranslationUnit()).mapToASTType(ct);
 			}
 		    if (prefix) {
 		        char[] p = fieldReference.getFieldName().toCharArray();