diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-08-11 15:15:53 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-08-11 15:15:53 -0400 |
| commit | baf36f2a83903362608aa244d8f1c3c4d0e35773 (patch) | |
| tree | 603b13da3589b8167bd460d9ea464a54a73b1a0d /cpp/include/Ice/Stream.h | |
| parent | implementing preserved slices in C# (diff) | |
| download | ice-baf36f2a83903362608aa244d8f1c3c4d0e35773.tar.bz2 ice-baf36f2a83903362608aa244d8f1c3c4d0e35773.tar.xz ice-baf36f2a83903362608aa244d8f1c3c4d0e35773.zip | |
Fixed bug #ICE-4845 (ice_clone for IceUtil::Exception is now covariant)
Small build fixes (VS warning, Python 3.x run.py)
slice2cpp no longer generates ice_clone for interfaces
Diffstat (limited to 'cpp/include/Ice/Stream.h')
| -rw-r--r-- | cpp/include/Ice/Stream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h index 3257def6c6a..a1876f32bcf 100644 --- a/cpp/include/Ice/Stream.h +++ b/cpp/include/Ice/Stream.h @@ -66,7 +66,7 @@ public: virtual void usesClasses(bool) = 0; virtual ::std::string ice_name() const = 0; - virtual Exception* ice_clone() const = 0; + virtual UserExceptionReader* ice_clone() const = 0; virtual void ice_throw() const = 0; virtual void __write(IceInternal::BasicStream*) const; @@ -422,7 +422,7 @@ public: virtual bool usesClasses() const = 0; virtual ::std::string ice_name() const = 0; - virtual Exception* ice_clone() const = 0; + virtual UserExceptionWriter* ice_clone() const = 0; virtual void ice_throw() const = 0; virtual void __write(IceInternal::BasicStream*) const; |