Brought code in line with changes to Samskivert. I have not started to

genericize Narya data structures, nor make the existing code type safe. That's
going to be an extremely large project.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4007 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/util/StreamableHashIntMap.java

@@ -65,8 +65,8 @@ public class StreamableHashIntMap extends HashIntMap
     {
         int ecount = size();
         out.writeInt(ecount);
-        for (Iterator iter = entrySet().iterator(); iter.hasNext(); ) {
-            HashIntMap.Entry entry = (HashIntMap.Entry) iter.next();
+        for (Iterator iter = intEntrySet().iterator(); iter.hasNext(); ) {
+            IntEntry entry = (IntEntry) iter.next();
             out.writeInt(entry.getIntKey());
             out.writeObject(entry.getValue());
         }

src/java/com/threerings/util/StreamableIntIntMap.java

@@ -66,7 +66,7 @@ public class StreamableIntIntMap extends IntIntMap
         int ecount = size();
         out.writeInt(ecount);
         for (Iterator itr = entrySet().iterator(); itr.hasNext(); ) {
-            Entry entry = (Entry) itr.next();
+            IntIntEntry entry = (IntIntEntry) itr.next();
             out.writeInt(entry.getIntKey());
             out.writeInt(entry.getIntValue());
         }