diff options
Diffstat (limited to 'cpp/src/Ice/Emitter.cpp')
-rw-r--r-- | cpp/src/Ice/Emitter.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/Emitter.cpp b/cpp/src/Ice/Emitter.cpp index 709f2dc56e1..a05da9429b6 100644 --- a/cpp/src/Ice/Emitter.cpp +++ b/cpp/src/Ice/Emitter.cpp @@ -64,7 +64,7 @@ IceInternal::Emitter::sendRequest(Outgoing* out, bool oneway) if (_exception.get()) { - _exception->raise(); + _exception->_throw(); } assert(_state == StateActive); @@ -99,7 +99,7 @@ IceInternal::Emitter::sendRequest(Outgoing* out, bool oneway) catch(const LocalException& ex) { setState(StateClosed, ex); - ex.raise(); + ex._throw(); } // @@ -120,7 +120,7 @@ IceInternal::Emitter::prepareBatchRequest(Outgoing* out) if (_exception.get()) { unlock(); - _exception->raise(); + _exception->_throw(); } assert(_state == StateActive); @@ -150,7 +150,7 @@ IceInternal::Emitter::finishBatchRequest(Outgoing* out) if (_exception.get()) { unlock(); - _exception->raise(); + _exception->_throw(); } assert(_state == StateActive); @@ -172,7 +172,7 @@ IceInternal::Emitter::flushBatchRequest() if (_exception.get()) { - _exception->raise(); + _exception->_throw(); } assert(_state == StateActive); @@ -206,7 +206,7 @@ IceInternal::Emitter::flushBatchRequest() catch(const LocalException& ex) { setState(StateClosed, ex); - ex.raise(); + ex._throw(); } } @@ -405,7 +405,7 @@ IceInternal::Emitter::setState(State state, const LocalException& ex) if (!_exception.get()) { - _exception = auto_ptr<LocalException>(ex.clone()); + _exception = auto_ptr<LocalException>(ex._clone()); } for (std::map< ::Ice::Int, Outgoing*>::iterator p = _requests.begin(); p != _requests.end(); ++p) @@ -487,11 +487,11 @@ IceInternal::EmitterFactory::create(const vector<EndpointPtr>& endpoints) } catch (const SocketException& ex) { - exception = auto_ptr<LocalException>(ex.clone()); + exception = auto_ptr<LocalException>(ex._clone()); } catch (const DNSException& ex) { - exception = auto_ptr<LocalException>(ex.clone()); + exception = auto_ptr<LocalException>(ex._clone()); } ++q; @@ -516,7 +516,7 @@ IceInternal::EmitterFactory::create(const vector<EndpointPtr>& endpoints) if (!emitter) { assert(exception.get()); - exception -> raise(); + exception->_throw(); } return emitter; |