diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 12:44:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 12:44:55 +0200 |
| commit | 5045400eb3ae5622d18e9a9b1b928d4ecc78bbf2 (patch) | |
| tree | eba20f04be60fd0498f9751cfbfb35e8b8e4fd0b /binaryurp/source | |
| parent | 6990ec19679d837edae17497e1173f2dae46c947 (diff) | |
Replace use of o3tl::heap_ptr with std::unique_ptr
Change-Id: Idbcb1be271ccda1885728ec5a6a75cfaec15f6f5
Diffstat (limited to 'binaryurp/source')
| -rw-r--r-- | binaryurp/source/reader.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx index 92da48519f33..3accf57d28ab 100644 --- a/binaryurp/source/reader.cxx +++ b/binaryurp/source/reader.cxx @@ -21,6 +21,7 @@ #include <cassert> #include <exception> +#include <memory> #include <vector> #include "boost/scoped_ptr.hpp" @@ -35,7 +36,6 @@ #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" @@ -328,7 +328,7 @@ void Reader::readMessage(Unmarshal & unmarshal) { } break; } - o3tl::heap_ptr< IncomingRequest > req( + std::unique_ptr< IncomingRequest > req( new IncomingRequest( bridge_, tid, oid, obj, type, functionId, synchronous, memberTd, setter, inArgs, ccMode, cc)); @@ -441,7 +441,7 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1) { switch (req.kind) { case OutgoingRequest::KIND_NORMAL: { - o3tl::heap_ptr< IncomingReply > resp( + std::unique_ptr< IncomingReply > resp( new IncomingReply(exc, ret, outArgs)); uno_threadpool_putJob( bridge_->getThreadPool(), tid.getHandle(), resp.get(), 0, |