diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-01-11 16:15:49 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-01-11 16:15:49 -0500 |
| commit | f6a5299766fe3db2273afd78f145486b091513ed (patch) | |
| tree | 87eead6b9fa33e43f7b863093fd410167d9cb23a /cpp/include/Ice/OutgoingAsync.h | |
| parent | Fixed Glacier2/router IE browser test failure (diff) | |
| download | ice-f6a5299766fe3db2273afd78f145486b091513ed.tar.bz2 ice-f6a5299766fe3db2273afd78f145486b091513ed.tar.xz ice-f6a5299766fe3db2273afd78f145486b091513ed.zip | |
Moved UniquePtr to IceInternal
Removed ctor and assignment operator from UniquePtr
Diffstat (limited to 'cpp/include/Ice/OutgoingAsync.h')
| -rw-r--r-- | cpp/include/Ice/OutgoingAsync.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h index cb83850a048..f401975a569 100644 --- a/cpp/include/Ice/OutgoingAsync.h +++ b/cpp/include/Ice/OutgoingAsync.h @@ -22,7 +22,7 @@ #include <Ice/InputStream.h> #include <Ice/ObserverHelper.h> #include <Ice/LocalException.h> -#include <IceUtil/UniquePtr.h> +#include <Ice/UniquePtr.h> #ifndef ICE_CPP11_MAPPING # include <Ice/AsyncResult.h> @@ -171,8 +171,8 @@ protected: Ice::LocalObjectPtr _cookie; #endif - IceUtil::UniquePtr<Ice::Exception> _ex; - IceUtil::UniquePtr<Ice::LocalException> _cancellationException; + IceInternal::UniquePtr<Ice::Exception> _ex; + IceInternal::UniquePtr<Ice::LocalException> _cancellationException; InvocationObserver _observer; ObserverHelperT<Ice::Instrumentation::ChildInvocationObserver> _childObserver; |