diff options
author | Bernard Normier <bernard@zeroc.com> | 2016-07-22 17:09:25 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2016-07-22 17:09:25 -0400 |
commit | 752e06b4eb63abb8a30bb958802eaedda72d3806 (patch) | |
tree | 7c2348544d202c310a55a62629abc4025daa03a5 /cpp/test/Ice/dispatcher/Dispatcher.cpp | |
parent | Disable VS 2015 update 3 optimizer (diff) | |
download | ice-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/test/Ice/dispatcher/Dispatcher.cpp')
-rw-r--r-- | cpp/test/Ice/dispatcher/Dispatcher.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/test/Ice/dispatcher/Dispatcher.cpp b/cpp/test/Ice/dispatcher/Dispatcher.cpp index bbf991b0f65..8fb96f06e1b 100644 --- a/cpp/test/Ice/dispatcher/Dispatcher.cpp +++ b/cpp/test/Ice/dispatcher/Dispatcher.cpp @@ -42,9 +42,13 @@ Dispatcher::isDispatcherThread() return IceUtil::ThreadControl() == _instance->getThreadControl(); } +#ifdef ICE_CPP11_MAPPING +void +Dispatcher::dispatch(const shared_ptr<DispatcherCall>& call, const shared_ptr<Ice::Connection>&) +#else void Dispatcher::dispatch(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr&) - +#endif { Lock sync(*this); _calls.push_back(call); @@ -59,7 +63,11 @@ Dispatcher::run() { while(true) { +#ifdef ICE_CPP11_MAPPING + shared_ptr<DispatcherCall> call; +#else Ice::DispatcherCallPtr call; +#endif { Lock sync(*this); @@ -95,3 +103,4 @@ Dispatcher::run() } } } + |