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/src/IceUtil/Exception.cpp | |
| 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/src/IceUtil/Exception.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Exception.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp index b6c75231f5a..c310b2fcb03 100644 --- a/cpp/src/IceUtil/Exception.cpp +++ b/cpp/src/IceUtil/Exception.cpp @@ -300,7 +300,7 @@ IceUtil::NullHandleException::ice_name() const return _name; } -IceUtil::Exception* +IceUtil::NullHandleException* IceUtil::NullHandleException::ice_clone() const { return new NullHandleException(*this); @@ -342,7 +342,7 @@ IceUtil::IllegalArgumentException::ice_print(ostream& out) const out << ": " << _reason; } -IceUtil::Exception* +IceUtil::IllegalArgumentException* IceUtil::IllegalArgumentException::ice_clone() const { return new IllegalArgumentException(*this); @@ -384,7 +384,7 @@ IceUtil::SyscallException::ice_print(ostream& os) const } } -IceUtil::Exception* +IceUtil::SyscallException* IceUtil::SyscallException::ice_clone() const { return new SyscallException(*this); @@ -433,7 +433,7 @@ IceUtil::FileLockException::ice_print(ostream& os) const } } -IceUtil::Exception* +IceUtil::FileLockException* IceUtil::FileLockException::ice_clone() const { return new FileLockException(*this); @@ -472,7 +472,7 @@ IceUtil::OptionalNotSetException::ice_name() const return _name; } -IceUtil::Exception* +IceUtil::OptionalNotSetException* IceUtil::OptionalNotSetException::ice_clone() const { return new OptionalNotSetException(*this); |