__in -> __inS, __out -> __outS See

    http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=322

1 files changed, 18 insertions, 18 deletions

diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/ObjectImpl.java
index 7c2727fa416..839406b6c2f 100644
--- a/java/src/Ice/ObjectImpl.java
+++ b/java/src/Ice/ObjectImpl.java
@@ -47,10 +47,10 @@ public class ObjectImpl implements Object, java.lang.Cloneable
     }
 
     public static IceInternal.DispatchStatus
-    ___ice_isA(Ice.Object __obj, IceInternal.Incoming __in, Current __current)
+    ___ice_isA(Ice.Object __obj, IceInternal.Incoming __inS, Current __current)
     {
-        IceInternal.BasicStream __is = __in.is();
-        IceInternal.BasicStream __os = __in.os();
+        IceInternal.BasicStream __is = __inS.is();
+        IceInternal.BasicStream __os = __inS.os();
         String __id = __is.readString();
         boolean __ret = __obj.ice_isA(__id, __current);
         __os.writeBool(__ret);
@@ -70,7 +70,7 @@ public class ObjectImpl implements Object, java.lang.Cloneable
     }
 
     public static IceInternal.DispatchStatus
-    ___ice_ping(Ice.Object __obj, IceInternal.Incoming __in, Current __current)
+    ___ice_ping(Ice.Object __obj, IceInternal.Incoming __inS, Current __current)
     {
         __obj.ice_ping(__current);
         return IceInternal.DispatchStatus.DispatchOK;
@@ -89,9 +89,9 @@ public class ObjectImpl implements Object, java.lang.Cloneable
     }
 
     public static IceInternal.DispatchStatus
-    ___ice_ids(Ice.Object __obj, IceInternal.Incoming __in, Current __current)
+    ___ice_ids(Ice.Object __obj, IceInternal.Incoming __inS, Current __current)
     {
-        IceInternal.BasicStream __os = __in.os();
+        IceInternal.BasicStream __os = __inS.os();
         String[] __ret = __obj.ice_ids(__current);
         __os.writeStringSeq(__ret);
         return IceInternal.DispatchStatus.DispatchOK;
@@ -110,9 +110,9 @@ public class ObjectImpl implements Object, java.lang.Cloneable
     }
 
     public static IceInternal.DispatchStatus
-    ___ice_id(Ice.Object __obj, IceInternal.Incoming __in, Current __current)
+    ___ice_id(Ice.Object __obj, IceInternal.Incoming __inS, Current __current)
     {
-        IceInternal.BasicStream __os = __in.os();
+        IceInternal.BasicStream __os = __inS.os();
         String __ret = __obj.ice_id(__current);
         __os.writeString(__ret);
         return IceInternal.DispatchStatus.DispatchOK;
@@ -205,31 +205,31 @@ public class ObjectImpl implements Object, java.lang.Cloneable
     }
 
     public void
-    __write(Ice.OutputStream __out)
+    __write(Ice.OutputStream __outS)
     {
-        __out.writeTypeId(ice_staticId());
-        __out.startSlice();
-        __out.writeSize(0); // For compatibility with the old AFM.
-        __out.endSlice();
+        __outS.writeTypeId(ice_staticId());
+        __outS.startSlice();
+        __outS.writeSize(0); // For compatibility with the old AFM.
+        __outS.endSlice();
     }
 
     public void
-    __read(Ice.InputStream __in, boolean __rid)
+    __read(Ice.InputStream __inS, boolean __rid)
     {
         if(__rid)
         {
-            String myId = __in.readTypeId();
+            String myId = __inS.readTypeId();
         }
 
-        __in.startSlice();
+        __inS.startSlice();
 
         // For compatibility with the old AFM.
-        int sz = __in.readSize();
+        int sz = __inS.readSize();
         if(sz != 0)
         {
             throw new MarshalException();
         }
 
-        __in.endSlice();
+        __inS.endSlice();
     }
 }