mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 02:06:01 +02:00
Code Issues Wiki Activity

bug 319512: Missing type arguments on managedbuilder.core

Browse source
This commit is contained in:
Andrew Gvozdev 2010-10-02 13:55:50 +00:00
parent f4220287f0
commit a5fd16d96c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConflictSet.java
View file

@ -27,7 +27,7 @@ import org.eclipse.core.runtime.IPath;
public class ConflictSet { public class ConflictSet {
public static final IConflict[] EMPTY_CONFLICT_ARRAY = new IConflict[0]; public static final IConflict[] EMPTY_CONFLICT_ARRAY = new IConflict[0];
public static final IRealBuildObjectAssociation[] EMPTY_BO_ARRAY = new IRealBuildObjectAssociation[0]; public static final IBuildObject[] EMPTY_BO_ARRAY = new IBuildObject[0];
private PerTypeMapStorage fConflictStorage; private PerTypeMapStorage fConflictStorage;
private List fConflictMatchList; private List fConflictMatchList;

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeMapStorage.java
View file

@ -19,8 +19,8 @@ import org.eclipse.cdt.managedbuilder.internal.core.IRealBuildObjectAssociation;
public class PerTypeMapStorage implements Cloneable { public class PerTypeMapStorage implements Cloneable {
private ObjectTypeBasedStorage fStorage = new ObjectTypeBasedStorage(); private ObjectTypeBasedStorage fStorage = new ObjectTypeBasedStorage();
public Map getMap(int type, boolean create){ public Map/*<IRealBuildObjectAssociation, ?>*/ getMap(int type, boolean create){
Map<IRealBuildObjectAssociation, Set> map = (Map<IRealBuildObjectAssociation, Set>)fStorage.get(type); Map<IRealBuildObjectAssociation, ?> map = (Map<IRealBuildObjectAssociation, ?>)fStorage.get(type);
if(map == null && create){ if(map == null && create){
map = createMap(null); map = createMap(null);
fStorage.set(type, map); fStorage.set(type, map);