diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-09-02 15:32:50 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-09-02 15:32:50 +0000 |
| commit | 6b73373de0f3bf106404f5c976791db96641d361 (patch) | |
| tree | 524233811433d561215a1d04ae813f3c7b60aa1e /cppe/src | |
| parent | Use auto_ptr.reset (diff) | |
| download | ice-6b73373de0f3bf106404f5c976791db96641d361.tar.bz2 ice-6b73373de0f3bf106404f5c976791db96641d361.tar.xz ice-6b73373de0f3bf106404f5c976791db96641d361.zip | |
Use auto_ptr reset
Diffstat (limited to 'cppe/src')
| -rwxr-xr-x | cppe/src/IceE/Connection.cpp | 4 | ||||
| -rw-r--r-- | cppe/src/IceE/Outgoing.cpp | 12 | ||||
| -rwxr-xr-x | cppe/src/IceE/OutgoingConnectionFactory.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp index 013cac3fb93..006406e0115 100755 --- a/cppe/src/IceE/Connection.cpp +++ b/cppe/src/IceE/Connection.cpp @@ -1057,7 +1057,7 @@ Ice::Connection::setState(State state, const LocalException& ex) // assert(_state != StateClosed); - _exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); + _exception.reset(dynamic_cast<LocalException*>(ex.ice_clone())); if(_warn) { @@ -1645,7 +1645,7 @@ Ice::Connection::run() } catch(const LocalException& ex) { - exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); + exception.reset(dynamic_cast<LocalException*>(ex.ice_clone())); } _transceiver = 0; diff --git a/cppe/src/IceE/Outgoing.cpp b/cppe/src/IceE/Outgoing.cpp index 95be783113c..c75ded2a4cc 100644 --- a/cppe/src/IceE/Outgoing.cpp +++ b/cppe/src/IceE/Outgoing.cpp @@ -19,12 +19,12 @@ using namespace IceInternal; IceInternal::NonRepeatable::NonRepeatable(const NonRepeatable& ex) { - _ex = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.get()->ice_clone())); + _ex.reset(dynamic_cast<LocalException*>(ex.get()->ice_clone())); } IceInternal::NonRepeatable::NonRepeatable(const ::Ice::LocalException& ex) { - _ex = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); + _ex.reset(dynamic_cast<LocalException*>(ex.ice_clone())); } const ::Ice::LocalException* @@ -388,7 +388,7 @@ IceInternal::Outgoing::finished(BasicStream& is) ex->id = ident; ex->facet = facet; ex->operation = operation; - _exception = auto_ptr<LocalException>(ex); + _exception.reset(ex); _state = StateLocalException; // The state must be set last, in case there is an exception. break; @@ -436,7 +436,7 @@ IceInternal::Outgoing::finished(BasicStream& is) } ex->unknown = unknown; - _exception = auto_ptr<LocalException>(ex); + _exception.reset(ex); _state = StateLocalException; // The state must be set last, in case there is an exception. break; @@ -444,7 +444,7 @@ IceInternal::Outgoing::finished(BasicStream& is) default: { - _exception = auto_ptr<LocalException>(new UnknownReplyStatusException(__FILE__, __LINE__)); + _exception.reset(new UnknownReplyStatusException(__FILE__, __LINE__)); _state = StateLocalException; break; } @@ -463,6 +463,6 @@ IceInternal::Outgoing::finished(const LocalException& ex) assert(_state <= StateInProgress); _state = StateLocalException; - _exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); + _exception.reset(dynamic_cast<LocalException*>(ex.ice_clone())); notify(); } diff --git a/cppe/src/IceE/OutgoingConnectionFactory.cpp b/cppe/src/IceE/OutgoingConnectionFactory.cpp index a00d79ec530..9d3fcf18e6c 100755 --- a/cppe/src/IceE/OutgoingConnectionFactory.cpp +++ b/cppe/src/IceE/OutgoingConnectionFactory.cpp @@ -262,7 +262,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpts } catch(const LocalException& ex) { - exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); + exception.reset(dynamic_cast<LocalException*>(ex.ice_clone())); // // If a connection object was constructed, then validate() |