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/Freeze/TransactionalEvictorContext.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/Freeze/TransactionalEvictorContext.cpp')
| -rw-r--r-- | cpp/src/Freeze/TransactionalEvictorContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Freeze/TransactionalEvictorContext.cpp b/cpp/src/Freeze/TransactionalEvictorContext.cpp index c65523fa836..b0dacafe261 100644 --- a/cpp/src/Freeze/TransactionalEvictorContext.cpp +++ b/cpp/src/Freeze/TransactionalEvictorContext.cpp @@ -39,7 +39,7 @@ Freeze::TransactionalEvictorDeadlockException::ice_name() const return "Freeze::TransactionalEvictorDeadlockException"; } -Ice::Exception* +Freeze::TransactionalEvictorDeadlockException* Freeze::TransactionalEvictorDeadlockException::ice_clone() const { return new TransactionalEvictorDeadlockException(*this); @@ -197,7 +197,7 @@ Freeze::TransactionalEvictorContext::exception(const std::exception& ex) if(dx != 0 && _owner == IceUtil::ThreadControl()) { - _deadlockException.reset(dynamic_cast<DeadlockException*>(dx->ice_clone())); + _deadlockException.reset(dx->ice_clone()); return false; } @@ -205,7 +205,7 @@ Freeze::TransactionalEvictorContext::exception(const std::exception& ex) dynamic_cast<const TransactionalEvictorDeadlockException*>(&ex); if(edx != 0 && _owner == IceUtil::ThreadControl()) { - _nestedCallDeadlockException.reset(dynamic_cast<TransactionalEvictorDeadlockException*>(edx->ice_clone())); + _nestedCallDeadlockException.reset(edx->ice_clone()); return false; } |