diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-10-05 16:31:52 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-10-05 16:31:52 -0400 |
| commit | 0d20d608543547fd2a3abcc08210fb7910773e3d (patch) | |
| tree | 33b4acb74e574e4cbced30693448fcd3808c8d9d /cpp/src/Ice/OutgoingAsync.cpp | |
| parent | Fixed ICE-4741 and minor add-in issues (diff) | |
| download | ice-0d20d608543547fd2a3abcc08210fb7910773e3d.tar.bz2 ice-0d20d608543547fd2a3abcc08210fb7910773e3d.tar.xz ice-0d20d608543547fd2a3abcc08210fb7910773e3d.zip | |
Port to gcc and clang in c++11 mode:
- for GCC, replaced most std::auto_ptr usage by a new IceUtil::UniquePtr
- for clang, added ICE_NOEXCEPT and ICE_NOEXCEPT_FALSE for a few dtors in Freeze
Diffstat (limited to 'cpp/src/Ice/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index e019e9e4949..dad736c7e14 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -68,7 +68,7 @@ public: private: const Ice::AsyncResultPtr _result; - const auto_ptr<Ice::Exception> _exception; + const IceUtil::UniquePtr<Ice::Exception> _exception; }; class AsynchronousSent : public DispatchWorkItem @@ -634,7 +634,7 @@ IceInternal::OutgoingAsync::__finished(BasicStream& is) string operation; _is.read(operation, false); - auto_ptr<RequestFailedException> ex; + IceUtil::UniquePtr<RequestFailedException> ex; switch(replyStatus) { case replyObjectNotExist: @@ -675,7 +675,7 @@ IceInternal::OutgoingAsync::__finished(BasicStream& is) string unknown; _is.read(unknown, false); - auto_ptr<UnknownException> ex; + IceUtil::UniquePtr<UnknownException> ex; switch(replyStatus) { case replyUnknownException: |