[Libreoffice-commits] core.git: binaryurp/source

[Stephan Bergmann]

 binaryurp/source/reader.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5045400eb3ae5622d18e9a9b1b928d4ecc78bbf2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 24 12:44:55 2014 +0200

    Replace use of o3tl::heap_ptr with std::unique_ptr
    
    Change-Id: Idbcb1be271ccda1885728ec5a6a75cfaec15f6f5

diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 92da485..3accf57 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,