diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-08-08 16:09:22 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-08-08 16:09:22 -0230 |
| commit | 36b0fecf6baca78f86ac16d236ef917d4fb0faff (patch) | |
| tree | a979f4e822ff1a1a50475a45d4f228aff1353de2 /java/src/IceInternal/MetricsMap.java | |
| parent | ICE-5596 add Ice.Default.Timeout property (diff) | |
| download | ice-36b0fecf6baca78f86ac16d236ef917d4fb0faff.tar.bz2 ice-36b0fecf6baca78f86ac16d236ef917d4fb0faff.tar.xz ice-36b0fecf6baca78f86ac16d236ef917d4fb0faff.zip | |
Fixed lots of warnings.
Diffstat (limited to 'java/src/IceInternal/MetricsMap.java')
| -rw-r--r-- | java/src/IceInternal/MetricsMap.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceInternal/MetricsMap.java b/java/src/IceInternal/MetricsMap.java index ea798edd6ee..c69af08cce2 100644 --- a/java/src/IceInternal/MetricsMap.java +++ b/java/src/IceInternal/MetricsMap.java @@ -80,7 +80,7 @@ public class MetricsMap<T extends IceMX.Metrics> } } - public MetricsMap + public MetricsMap<?> getMap() { return MetricsMap.this; @@ -121,7 +121,7 @@ public class MetricsMap<T extends IceMX.Metrics> T metrics = (T)_object.clone(); if(_subMaps != null) { - for(SubMap s : _subMaps.values()) + for(SubMap<?> s : _subMaps.values()) { s.addSubMapToMetrics(metrics); } |