summaryrefslogtreecommitdiff
path: root/cpp/src/Glacier2Lib/SessionHelper.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-07-22 17:09:25 -0400
committerBernard Normier <bernard@zeroc.com>2016-07-22 17:09:25 -0400
commit752e06b4eb63abb8a30bb958802eaedda72d3806 (patch)
tree7c2348544d202c310a55a62629abc4025daa03a5 /cpp/src/Glacier2Lib/SessionHelper.cpp
parentDisable VS 2015 update 3 optimizer (diff)
downloadice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.bz2
ice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.xz
ice-752e06b4eb63abb8a30bb958802eaedda72d3806.zip
Added ICE_BUILDING_SRC to make builds
Ice::Dispatcher and Ice::LocalObject are now hidden with C++11 Reworked C++11 exception ice_clone, added ExceptionHelper + other C++ cleanups
Diffstat (limited to 'cpp/src/Glacier2Lib/SessionHelper.cpp')
-rw-r--r--cpp/src/Glacier2Lib/SessionHelper.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index 6204bd89126..b5b07f57d6a 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -525,30 +525,15 @@ public:
virtual void
run()
{
-#ifdef ICE_CPP11_MAPPING
- try
- {
- rethrow_exception(_ex);
- }
- catch(const Ice::Exception& ex)
- {
- _callback->connectFailed(_session, ex);
- }
-#else
const Ice::Exception* ex(_ex.get());
_callback->connectFailed(_session, *ex);
-#endif
}
private:
const Glacier2::SessionCallbackPtr _callback;
const Glacier2::SessionHelperPtr _session;
-#ifdef ICE_CPP11_MAPPING
- std::exception_ptr _ex;
-#else
IceUtil::UniquePtr<Ice::Exception> _ex;
-#endif
};
class CreatedCommunicator : public Ice::DispatcherCall