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/operations/OnewaysAMI.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/operations/OnewaysAMI.cpp')
| -rw-r--r-- | cpp/test/Ice/operations/OnewaysAMI.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cpp/test/Ice/operations/OnewaysAMI.cpp b/cpp/test/Ice/operations/OnewaysAMI.cpp index 4d322b4eef4..aee37aa8ee4 100644 --- a/cpp/test/Ice/operations/OnewaysAMI.cpp +++ b/cpp/test/Ice/operations/OnewaysAMI.cpp @@ -16,7 +16,10 @@ using namespace std; namespace { -class CallbackBase : public Ice::LocalObject +class CallbackBase +#ifndef ICE_CPP11_MAPPING +: public Ice::LocalObject +#endif { public: @@ -55,8 +58,6 @@ private: bool _called; }; -typedef IceUtil::Handle<CallbackBase> CallbackBasePtr; - class Callback : public CallbackBase { public: @@ -75,7 +76,7 @@ public: test(false); } }; -typedef IceUtil::Handle<Callback> CallbackPtr; +ICE_DEFINE_PTR(CallbackPtr, Callback); } @@ -85,7 +86,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx, proxy->ice_oneway()); { - CallbackPtr cb = new Callback; + CallbackPtr cb = ICE_MAKE_SHARED(Callback); #ifdef ICE_CPP11_MAPPING p->ice_pingAsync( nullptr, @@ -162,7 +163,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) } { - CallbackPtr cb = new Callback; + CallbackPtr cb = ICE_MAKE_SHARED(Callback); #ifdef ICE_CPP11_MAPPING p->opVoidAsync( nullptr, @@ -183,7 +184,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) } { - CallbackPtr cb = new Callback; + CallbackPtr cb = ICE_MAKE_SHARED(Callback); #ifdef ICE_CPP11_MAPPING p->opIdempotentAsync( nullptr, @@ -204,7 +205,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) } { - CallbackPtr cb = new Callback; + CallbackPtr cb = ICE_MAKE_SHARED(Callback); #ifdef ICE_CPP11_MAPPING p->opNonmutatingAsync( nullptr, @@ -244,7 +245,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) } #ifdef ICE_CPP11_MAPPING { - CallbackPtr cb = new Callback; + CallbackPtr cb = ICE_MAKE_SHARED(Callback); p->ice_pingAsync(nullptr, [=](exception_ptr e) { |