diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-07 16:00:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-07 18:43:32 +0100 |
| commit | cf1f27affccb3fa97c4b4157dd34fe5c6ef6c6c8 (patch) | |
| tree | 75da2128ec28be2584a53cda2a812c8790aafb3c /binaryurp | |
| parent | 6606611c425823726f1f40ea085acc982906cef6 (diff) | |
auto_ptr -> heap_ptr
Change-Id: I8e7845c8148339fb305666e316b74fd134774ea3
Diffstat (limited to 'binaryurp')
| -rw-r--r-- | binaryurp/source/reader.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx index 440288881b57..99b27443a5dc 100644 --- a/binaryurp/source/reader.cxx +++ b/binaryurp/source/reader.cxx @@ -21,7 +21,6 @@ #include <cassert> #include <exception> -#include <memory> #include <vector> #include "boost/scoped_ptr.hpp" @@ -36,6 +35,7 @@ #include "com/sun/star/uno/XCurrentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppu/unotype.hxx" +#include "o3tl/heap_ptr.hxx" #include "rtl/byteseq.h" #include "rtl/ustring.hxx" #include "sal/types.h" @@ -341,12 +341,10 @@ void Reader::readMessage(Unmarshal & unmarshal) { } break; } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< IncomingRequest > req( + o3tl::heap_ptr< IncomingRequest > req( new IncomingRequest( bridge_, tid, oid, obj, type, functionId, synchronous, memberTd, setter, inArgs, ccMode, cc)); - SAL_WNODEPRECATED_DECLARATIONS_POP if (synchronous) { bridge_->incrementActiveCalls(); } @@ -457,10 +455,8 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1) { switch (req.kind) { case OutgoingRequest::KIND_NORMAL: { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< IncomingReply > resp( + o3tl::heap_ptr< IncomingReply > resp( new IncomingReply(exc, ret, outArgs)); - SAL_WNODEPRECATED_DECLARATIONS_POP uno_threadpool_putJob( bridge_->getThreadPool(), tid.getHandle(), resp.get(), 0, false); |