1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

Follow up for bug 209614.

This commit is contained in:
Markus Schorn 2008-01-09 09:05:24 +00:00
parent 204b33a9ba
commit 000b5c50e2
2 changed files with 4 additions and 3 deletions

View file

@ -14,10 +14,10 @@ package org.eclipse.cdt.internal.core.parser.scanner;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Map; import java.util.Map;
import org.eclipse.cdt.core.dom.ICodeReaderFactory; import org.eclipse.cdt.core.dom.ICodeReaderFactory;
@ -1101,7 +1101,7 @@ public class CPreprocessor implements ILexerLog, IScanner {
} }
private void processInclusionFromIndex(String path, FileInclusionHandling fi) { private void processInclusionFromIndex(String path, FileInclusionHandling fi) {
ArrayList<IIndexMacro> mdefs= fi.getMacroDefinitions(); List<IIndexMacro> mdefs= fi.getMacroDefinitions();
for (IIndexMacro macro : mdefs) { for (IIndexMacro macro : mdefs) {
addMacroDefinition(macro); addMacroDefinition(macro);
} }

View file

@ -11,6 +11,7 @@
package org.eclipse.cdt.internal.core.parser.scanner; package org.eclipse.cdt.internal.core.parser.scanner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.eclipse.cdt.core.index.IIndexMacro; import org.eclipse.cdt.core.index.IIndexMacro;
import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.CodeReader;
@ -81,7 +82,7 @@ public class FileInclusionHandling {
* Valid with {@link InclusionKind#FOUND_IN_INDEX}. * Valid with {@link InclusionKind#FOUND_IN_INDEX}.
* @return the macroDefinitions * @return the macroDefinitions
*/ */
public ArrayList<IIndexMacro> getMacroDefinitions() { public List<IIndexMacro> getMacroDefinitions() {
return fMacroDefinitions; return fMacroDefinitions;
} }