__in -> __inS, __out -> __outS See

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

4 files changed, 43 insertions, 43 deletions

diff --git a/java/src/Ice/Object.java b/java/src/Ice/Object.java
index b6f076e4982..dae400e2027 100644
--- a/java/src/Ice/Object.java
+++ b/java/src/Ice/Object.java
@@ -37,6 +37,6 @@ public interface Object
     void __write(IceInternal.BasicStream __os);
     void __read(IceInternal.BasicStream __is, boolean __rid);
 
-    void __write(OutputStream __out);
-    void __read(InputStream __in, boolean __rid);
+    void __write(OutputStream __outS);
+    void __read(InputStream __inS, boolean __rid);
 }
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();
     }
 }
diff --git a/java/src/Ice/UserException.java b/java/src/Ice/UserException.java
index 440feefac69..085be6c2b55 100644
--- a/java/src/Ice/UserException.java
+++ b/java/src/Ice/UserException.java
@@ -35,13 +35,13 @@ public abstract class UserException extends Exception
     __read(IceInternal.BasicStream __is, boolean __rid);
 
     public void
-    __write(Ice.OutputStream __out)
+    __write(Ice.OutputStream __outS)
     {
         assert(false);
     }
 
     public void
-    __read(Ice.InputStream __in, boolean __rid)
+    __read(Ice.InputStream __inS, boolean __rid)
     {
         assert(false);
     }
diff --git a/java/src/Ice/_ObjectDelM.java b/java/src/Ice/_ObjectDelM.java
index e725a3af04b..ecc7d390f8c 100644
--- a/java/src/Ice/_ObjectDelM.java
+++ b/java/src/Ice/_ObjectDelM.java
@@ -15,13 +15,13 @@ public class _ObjectDelM implements _ObjectDel
     ice_isA(String __id, java.util.Map __context)
         throws IceInternal.NonRepeatable
     {
-        IceInternal.Outgoing __out = getOutgoing("ice_isA", OperationMode.Nonmutating, __context);
+        IceInternal.Outgoing __outS = getOutgoing("ice_isA", OperationMode.Nonmutating, __context);
         try
         {
-            IceInternal.BasicStream __is = __out.is();
-            IceInternal.BasicStream __os = __out.os();
+            IceInternal.BasicStream __is = __outS.is();
+            IceInternal.BasicStream __os = __outS.os();
             __os.writeString(__id);
-            if(!__out.invoke())
+            if(!__outS.invoke())
             {
                 throw new UnknownUserException();
             }
@@ -36,7 +36,7 @@ public class _ObjectDelM implements _ObjectDel
         }
         finally
         {
-            reclaimOutgoing(__out);
+            reclaimOutgoing(__outS);
         }
     }
 
@@ -44,17 +44,17 @@ public class _ObjectDelM implements _ObjectDel
     ice_ping(java.util.Map __context)
         throws IceInternal.NonRepeatable
     {
-        IceInternal.Outgoing __out = getOutgoing("ice_ping", OperationMode.Nonmutating, __context);
+        IceInternal.Outgoing __outS = getOutgoing("ice_ping", OperationMode.Nonmutating, __context);
         try
         {
-            if(!__out.invoke())
+            if(!__outS.invoke())
             {
                 throw new UnknownUserException();
             }
         }
         finally
         {
-            reclaimOutgoing(__out);
+            reclaimOutgoing(__outS);
         }
     }
 
@@ -62,11 +62,11 @@ public class _ObjectDelM implements _ObjectDel
     ice_ids(java.util.Map __context)
         throws IceInternal.NonRepeatable
     {
-        IceInternal.Outgoing __out = getOutgoing("ice_ids", OperationMode.Nonmutating, __context);
+        IceInternal.Outgoing __outS = getOutgoing("ice_ids", OperationMode.Nonmutating, __context);
         try
         {
-            IceInternal.BasicStream __is = __out.is();
-            if(!__out.invoke())
+            IceInternal.BasicStream __is = __outS.is();
+            if(!__outS.invoke())
             {
                 throw new UnknownUserException();
             }
@@ -81,7 +81,7 @@ public class _ObjectDelM implements _ObjectDel
         }
         finally
         {
-            reclaimOutgoing(__out);
+            reclaimOutgoing(__outS);
         }
     }
 
@@ -89,11 +89,11 @@ public class _ObjectDelM implements _ObjectDel
     ice_id(java.util.Map __context)
         throws IceInternal.NonRepeatable
     {
-        IceInternal.Outgoing __out = getOutgoing("ice_id", OperationMode.Nonmutating, __context);
+        IceInternal.Outgoing __outS = getOutgoing("ice_id", OperationMode.Nonmutating, __context);
         try
         {
-            IceInternal.BasicStream __is = __out.is();
-            if(!__out.invoke())
+            IceInternal.BasicStream __is = __outS.is();
+            if(!__outS.invoke())
             {
                 throw new UnknownUserException();
             }
@@ -108,7 +108,7 @@ public class _ObjectDelM implements _ObjectDel
         }
         finally
         {
-            reclaimOutgoing(__out);
+            reclaimOutgoing(__outS);
         }
     }
 
@@ -116,20 +116,20 @@ public class _ObjectDelM implements _ObjectDel
     ice_invoke(String operation, OperationMode mode, byte[] inParams, ByteSeqHolder outParams, java.util.Map __context)
         throws IceInternal.NonRepeatable
     {
-        IceInternal.Outgoing __out = getOutgoing(operation, mode, __context);
+        IceInternal.Outgoing __outS = getOutgoing(operation, mode, __context);
         try
         {
             if(inParams != null)
             {
-                IceInternal.BasicStream __os = __out.os();
+                IceInternal.BasicStream __os = __outS.os();
                 __os.writeBlob(inParams);
             }
-            boolean ok = __out.invoke();
+            boolean ok = __outS.invoke();
             if(__reference.getMode() == IceInternal.Reference.ModeTwoway)
             {
                 try
                 {
-                    IceInternal.BasicStream __is = __out.is();
+                    IceInternal.BasicStream __is = __outS.is();
                     int sz = __is.getReadEncapsSize();
                     if(outParams != null)
                     {
@@ -145,7 +145,7 @@ public class _ObjectDelM implements _ObjectDel
         }
         finally
         {
-            reclaimOutgoing(__out);
+            reclaimOutgoing(__outS);
         }
     }