Skip to main content
summaryrefslogtreecommitdiffstats
path: root/xlc
diff options
context:
space:
mode:
authorAndrew Gvozdev2010-07-21 00:10:41 -0400
committerAndrew Gvozdev2010-07-21 00:10:41 -0400
commit6fc9f2b2bf46ff73336828356d206baba3710e5c (patch)
treefd7c590155b95be50dac8e217097839faa18a4bb /xlc
parent459affd72f47d3fa027d2ed12629e27bbecaf9bc (diff)
downloadorg.eclipse.cdt-6fc9f2b2bf46ff73336828356d206baba3710e5c.tar.gz
org.eclipse.cdt-6fc9f2b2bf46ff73336828356d206baba3710e5c.tar.xz
org.eclipse.cdt-6fc9f2b2bf46ff73336828356d206baba3710e5c.zip
bug 319512: compilation warnings
Diffstat (limited to 'xlc')
-rw-r--r--xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/PerFileXLCScannerInfoCollector.java16
1 files changed, 7 insertions, 9 deletions
diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/PerFileXLCScannerInfoCollector.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/PerFileXLCScannerInfoCollector.java
index fcd524e28b..5a3d7bbd2c 100644
--- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/PerFileXLCScannerInfoCollector.java
+++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/PerFileXLCScannerInfoCollector.java
@@ -189,7 +189,6 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
for (ICLanguageSettingEntry entry : entries) {
if (((CMacroEntry) entry).getName().equals(symbol)) {
- int flags = entry.getFlags();
symbolFound = true; // it's already there, so don't set it
break;
}
@@ -269,11 +268,11 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
}
}
- public Map getPathInfoMap() {
+ public Map<IResource, PathInfo> getPathInfoMap() {
synchronized (fLock) {
IPerFileDiscoveredPathInfo2 info1 = getPerFileInfo1();
if (info1 != null) {
- Map map = new HashMap();
+ Map<IResource, PathInfo> map = new HashMap<IResource, PathInfo>();
map.putAll(info1.getPathInfoMap());
map.putAll(fInfo2.getPathInfoMap());
return map;
@@ -383,7 +382,7 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
}
}
- public Map getSymbols(IPath path) {
+ public Map<String, String> getSymbols(IPath path) {
synchronized (fLock) {
Map<String, String> symbols = new HashMap<String, String>();
@@ -439,7 +438,7 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
return fInfo2.getSerializable();
}
- public Map getSymbols() {
+ public Map<String, String> getSymbols() {
synchronized (fLock) {
return fInfo1.getSymbols();
}
@@ -630,9 +629,8 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
// get the command
CCommandDSC cmd = getCommand(path);
if (cmd != null && cmd.isDiscovered()) {
- List symbols = cmd.getSymbols();
- for (Iterator i = symbols.iterator(); i.hasNext();) {
- String symbol = (String) i.next();
+ List<String> symbols = cmd.getSymbols();
+ for (String symbol : symbols) {
String key = ScannerConfigUtil.getSymbolKey(symbol);
String value = ScannerConfigUtil.getSymbolValue(symbol);
definedSymbols.put(key, value);
@@ -1520,7 +1518,7 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.scannerconfig.IManagedScannerInfoCollector#getIncludePaths()
*/
- public List getIncludePaths() {
+ public List<String> getIncludePaths() {
synchronized (fLock) {
List<String> pathStrings = new LinkedList<String>();

Back to the top