diff options
| -rw-r--r-- | cpp/src/Ice/StreamI.cpp | 3 | ||||
| -rw-r--r-- | cs/src/Ice/AssemblyUtil.cs | 2 | ||||
| -rw-r--r-- | cs/src/Ice/Stream.cs | 4 | ||||
| -rw-r--r-- | java/src/Ice/UserExceptionWriter.java | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp index 26ecc8acb19..4e5bd68c231 100644 --- a/cpp/src/Ice/StreamI.cpp +++ b/cpp/src/Ice/StreamI.cpp @@ -698,7 +698,8 @@ Ice::UserExceptionWriter::~UserExceptionWriter() throw() void Ice::UserExceptionWriter::__write(BasicStream* os) const { - OutputStreamPtr stream = new OutputStreamI(_communicator, os); + OutputStreamI* stream = reinterpret_cast<OutputStreamI*>(os->closure()); + assert(stream); write(stream); } diff --git a/cs/src/Ice/AssemblyUtil.cs b/cs/src/Ice/AssemblyUtil.cs index c16564fcca3..5bd593a6bbc 100644 --- a/cs/src/Ice/AssemblyUtil.cs +++ b/cs/src/Ice/AssemblyUtil.cs @@ -170,7 +170,7 @@ namespace IceInternal _loadedAssemblies[ra.FullName] = ra; loadReferencedAssemblies(ra); } - catch(System.Exception ex) + catch(System.Exception) { // Ignore assemblies that cannot be loaded. } diff --git a/cs/src/Ice/Stream.cs b/cs/src/Ice/Stream.cs index 683d0248f67..b0e0591935f 100644 --- a/cs/src/Ice/Stream.cs +++ b/cs/src/Ice/Stream.cs @@ -166,9 +166,9 @@ namespace Ice public abstract void write(OutputStream os); public abstract bool usesClasses(); - public override void write__(IceInternal.BasicStream ostr) + public override void write__(IceInternal.BasicStream os) { - OutputStream stream = new OutputStreamI(communicator_, ostr); + OutputStream stream = (OutputStream)os.closure(); write(stream); } diff --git a/java/src/Ice/UserExceptionWriter.java b/java/src/Ice/UserExceptionWriter.java index d05e3387101..b2701394543 100644 --- a/java/src/Ice/UserExceptionWriter.java +++ b/java/src/Ice/UserExceptionWriter.java @@ -25,7 +25,7 @@ public abstract class UserExceptionWriter extends UserException public void __write(IceInternal.BasicStream os) { - OutputStream stream = new OutputStreamI(_communicator, os); + OutputStream stream = (OutputStream)os.closure(); write(stream); } |