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/Options.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/Options.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Options.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp index b632d0e90fa..32840de107c 100644 --- a/cpp/src/IceUtil/Options.cpp +++ b/cpp/src/IceUtil/Options.cpp @@ -42,7 +42,7 @@ IceUtilInternal::APIException::ice_print(ostream& out) const } } -IceUtil::Exception* +IceUtilInternal::APIException* IceUtilInternal::APIException::ice_clone() const { return new APIException(*this); @@ -88,7 +88,7 @@ IceUtilInternal::BadOptException::ice_print(ostream& out) const } } -IceUtil::Exception* +IceUtilInternal::BadOptException* IceUtilInternal::BadOptException::ice_clone() const { return new BadOptException(*this); |