Removed unused holder types.

Fixed holder types to use the generic holder type.
Changed the code generator to use the generic holder types.
Changed the Ice internals not to use the non-generic holder types.

1 files changed, 2 insertions, 2 deletions

diff --git a/java/src/IceUtilInternal/StringUtil.java b/java/src/IceUtilInternal/StringUtil.java
index 605a40cd0ba..3feb6278539 100644
--- a/java/src/IceUtilInternal/StringUtil.java
+++ b/java/src/IceUtilInternal/StringUtil.java
@@ -224,7 +224,7 @@ public final class StringUtil
     // newStart is set to the index of the first character following the decoded character
     // or escape sequence.
     //
-    private static char decodeChar(String s, int start, int end, Ice.IntHolder nextStart)
+    private static char decodeChar(String s, int start, int end, Ice.Holder<Integer> nextStart)
     {
         assert(start >= 0);
         assert(start < end);
@@ -327,7 +327,7 @@ public final class StringUtil
     private static void
     decodeString(String s, int start, int end, StringBuilder sb)
     {
-        Ice.IntHolder nextStart = new Ice.IntHolder();
+        Ice.Holder<Integer> nextStart = new Ice.Holder<Integer>();
         while(start < end)
         {
             sb.append(decodeChar(s, start, end, nextStart));