diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-15 20:41:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-16 12:54:44 +0000 |
| commit | a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 (patch) | |
| tree | 56a29f66f75f326a0a677ab1697ce28f1bc9fcbf /binaryurp | |
| parent | 18f41dfaf19d656d290c47d196ef2702e169a522 (diff) | |
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'binaryurp')
| -rw-r--r-- | binaryurp/source/bridge.cxx | 4 | ||||
| -rw-r--r-- | binaryurp/source/reader.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 9191d2349e50..876e6f118634 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -23,10 +23,10 @@ #include <cassert> #include <cstddef> #include <limits> +#include <memory> #include <vector> #include "boost/noncopyable.hpp" -#include "boost/scoped_ptr.hpp" #include "com/sun/star/bridge/InvalidProtocolChangeException.hpp" #include "com/sun/star/bridge/XBridge.hpp" #include "com/sun/star/bridge/XInstanceProvider.hpp" @@ -584,7 +584,7 @@ bool Bridge::makeCall( bool setter, std::vector< BinaryAny > const & inArguments, BinaryAny * returnValue, std::vector< BinaryAny > * outArguments) { - boost::scoped_ptr< IncomingReply > resp; + std::unique_ptr< IncomingReply > resp; { uno_ThreadPool tp = getThreadPool(); AttachThread att(tp); diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx index 3accf57d28ab..880b1ad99d20 100644 --- a/binaryurp/source/reader.cxx +++ b/binaryurp/source/reader.cxx @@ -24,7 +24,6 @@ #include <memory> #include <vector> -#include "boost/scoped_ptr.hpp" #include "com/sun/star/connection/XConnection.hpp" #include "com/sun/star/io/IOException.hpp" #include "com/sun/star/uno/Any.hxx" @@ -80,7 +79,7 @@ css::uno::Sequence< sal_Int8 > read( extern "C" void SAL_CALL request(void * pThreadSpecificData) { assert(pThreadSpecificData != 0); - boost::scoped_ptr< IncomingRequest >( + std::unique_ptr< IncomingRequest >( static_cast< IncomingRequest * >(pThreadSpecificData))-> execute(); } |