diff options
| author | Jose <jose@zeroc.com> | 2016-01-19 16:27:53 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-19 16:27:53 +0100 |
| commit | 6faa017414ad0321fd28da58ab5d3c851ec7f1f2 (patch) | |
| tree | e9e9146105ffc5c23edd72b38d02442ba1fe2bbd /cpp/src/Ice/OutgoingAsync.cpp | |
| parent | Fix IEE-162 - multiple bluetooth test failures (diff) | |
| download | ice-6faa017414ad0321fd28da58ab5d3c851ec7f1f2.tar.bz2 ice-6faa017414ad0321fd28da58ab5d3c851ec7f1f2.tar.xz ice-6faa017414ad0321fd28da58ab5d3c851ec7f1f2.zip | |
Deprecate ice_name and add ice_id
Diffstat (limited to 'cpp/src/Ice/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 74bdd2c9bd0..5c60223e335 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -87,7 +87,7 @@ OutgoingAsyncBase::finished(const Exception& ex) { if(_childObserver) { - _childObserver.failed(ex.ice_name()); + _childObserver.failed(ex.ice_id()); _childObserver.detach(); } return AsyncResult::finished(ex); @@ -104,7 +104,7 @@ ProxyOutgoingAsyncBase::completed(const Exception& exc) { if(_childObserver) { - _childObserver.failed(exc.ice_name()); + _childObserver.failed(exc.ice_id()); _childObserver.detach(); } @@ -297,7 +297,7 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread) { if(_childObserver) { - _childObserver.failed(ex.ice_name()); + _childObserver.failed(ex.ice_id()); _childObserver.detach(); } int interval = handleException(ex); @@ -945,7 +945,7 @@ CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con) virtual bool completed(const Exception& ex) { - _childObserver.failed(ex.ice_name()); + _childObserver.failed(ex.ice_id()); _childObserver.detach(); _outAsync->check(false); return false; @@ -1071,7 +1071,7 @@ OnewayClosureCallback::completed(const AsyncResultPtr& __result) const } catch(const UserException& __ex) { - throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); + throw UnknownUserException(__FILE__, __LINE__, __ex.ice_id()); } } __result->__readEmptyParams(); @@ -1195,7 +1195,7 @@ TwowayClosureCallback::completed(const AsyncResultPtr& __result) const { __userException(__ex); } - throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); + throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_id()); } } else |