summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/MetricsMap.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/IceInternal/MetricsMap.java')
-rw-r--r--java/src/IceInternal/MetricsMap.java4
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);
}