* Minor C++ fixes

* Adding UnknownSlicedObject in Java

1 files changed, 30 insertions, 0 deletions

diff --git a/java/src/Ice/OutputStream.java b/java/src/Ice/OutputStream.java
index e86c20983a7..7d7df18b576 100644
--- a/java/src/Ice/OutputStream.java
+++ b/java/src/Ice/OutputStream.java
@@ -175,6 +175,14 @@ public interface OutputStream
     void writeObject(Ice.Object v);
 
     /**
+     * Write an enumerated value.
+     *
+     * @param v The enumerator.
+     * @param limit The number of enumerators in the definition.
+     **/
+    void writeEnum(int v, int limit);
+
+    /**
      * Writes a user exception to the stream.
      *
      * @param id The user exception to write.
@@ -243,6 +251,13 @@ public interface OutputStream
     void endEncapsulation();
 
     /**
+     * Determines the current encoding version.
+     *
+     * @return The encoding version.
+     **/
+    EncodingVersion getEncoding();
+
+    /**
      * Writes the state of Slice classes whose index was previously
      * written with {@link #writeObject} to the stream.
      **/
@@ -256,6 +271,21 @@ public interface OutputStream
     byte[] finished();
 
     /**
+     * Determines the current position in the stream.
+     *
+     * @return The current position.
+     **/
+    int pos();
+
+    /**
+     * Inserts a fixed 32-bit size value into the stream at the given position.
+     *
+     * @param pos The position at which to write the value.
+     * @param sz The size value.
+     **/
+    void rewrite(int pos, int sz);
+
+    /**
      * Resets this output stream. This method allows the stream to be reused, to avoid creating
      * unnecessary garbage.
      *