From 000b5c50e294fd66c56e2295bfd7ace7cb3cef27 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Wed, 9 Jan 2008 09:05:24 +0000
Subject: [PATCH] Follow up for bug 209614.

---
 .../cdt/internal/core/parser/scanner/CPreprocessor.java       | 4 ++--
 .../internal/core/parser/scanner/FileInclusionHandling.java   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
index e1acc5ad44c..03a2ce8e21c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
@@ -14,10 +14,10 @@ package org.eclipse.cdt.internal.core.parser.scanner;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.cdt.core.dom.ICodeReaderFactory;
@@ -1101,7 +1101,7 @@ public class CPreprocessor implements ILexerLog, IScanner {
 	}
 
 	private void processInclusionFromIndex(String path, FileInclusionHandling fi) {
-		ArrayList<IIndexMacro> mdefs= fi.getMacroDefinitions();
+		List<IIndexMacro> mdefs= fi.getMacroDefinitions();
 		for (IIndexMacro macro : mdefs) {
 			addMacroDefinition(macro);
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/FileInclusionHandling.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/FileInclusionHandling.java
index c30eb306bec..8b05793cd1d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/FileInclusionHandling.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/FileInclusionHandling.java
@@ -11,6 +11,7 @@
 package org.eclipse.cdt.internal.core.parser.scanner;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.cdt.core.index.IIndexMacro;
 import org.eclipse.cdt.core.parser.CodeReader;
@@ -81,7 +82,7 @@ public class FileInclusionHandling {
 	 * Valid with {@link InclusionKind#FOUND_IN_INDEX}.
 	 * @return the macroDefinitions
 	 */
-	public ArrayList<IIndexMacro> getMacroDefinitions() {
+	public List<IIndexMacro> getMacroDefinitions() {
 		return fMacroDefinitions;
 	}