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/IceUtil/ThreadException.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/IceUtil/ThreadException.h')
| -rw-r--r-- | cpp/include/IceUtil/ThreadException.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h index d0444c20573..b723ff4d4fe 100644 --- a/cpp/include/IceUtil/ThreadException.h +++ b/cpp/include/IceUtil/ThreadException.h @@ -21,7 +21,7 @@ public: ThreadSyscallException(const char*, int, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual ThreadSyscallException* ice_clone() const; virtual void ice_throw() const; private: @@ -35,7 +35,7 @@ public: ThreadLockedException(const char*, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual ThreadLockedException* ice_clone() const; virtual void ice_throw() const; private: @@ -49,7 +49,7 @@ public: ThreadStartedException(const char*, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual ThreadStartedException* ice_clone() const; virtual void ice_throw() const; private: @@ -63,7 +63,7 @@ public: ThreadNotStartedException(const char*, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual ThreadNotStartedException* ice_clone() const; virtual void ice_throw() const; private: @@ -77,7 +77,7 @@ public: BadThreadControlException(const char*, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual BadThreadControlException* ice_clone() const; virtual void ice_throw() const; private: @@ -92,7 +92,7 @@ public: InvalidTimeoutException(const char*, int, const Time&); virtual std::string ice_name() const; virtual void ice_print(std::ostream&) const; - virtual Exception* ice_clone() const; + virtual InvalidTimeoutException* ice_clone() const; virtual void ice_throw() const; private: |