- Fixing bug 2522 for Python. This involved adding the C++ class

  UserExceptionWriter so that the Python extension can wrap a native
  Python user exception into something that the C++ run time can
  marshal. Also ported the changes to the servantLocator test.

- Implementing UserExceptionWriter in Java and C#.

- Consolidating the source files for the C# streaming API.

1 files changed, 8 insertions, 0 deletions

diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index 7cab7da51ef..30edcafb305 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -97,6 +97,9 @@ public:
     //
     Instance* instance() const { return _instance; } // Inlined for performance reasons.
 
+    void* closure() const;
+    void* closure(void*);
+
     void swap(BasicStream&);
 
     void resize(Container::size_type sz)
@@ -594,6 +597,11 @@ private:
     //
     Instance* _instance;
 
+    //
+    // The public stream API needs to attach data to a stream.
+    //
+    void* _closure;
+
     class ICE_API ReadEncaps : private ::IceUtil::noncopyable
     {
     public: