diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-15 20:54:22 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-16 12:54:45 +0000 |
commit | 01a8bda416d1598f5486f95b6a57d61ff09873ed (patch) | |
tree | c37934d13308426d22599f63bf8666305a6b1f80 /binaryurp/source/bridge.cxx | |
parent | boost::foo_ptr->std::foo_ptr (diff) | |
download | core-01a8bda416d1598f5486f95b6a57d61ff09873ed.tar.gz core-01a8bda416d1598f5486f95b6a57d61ff09873ed.zip |
boost::noncopyable->'= delete'
Change-Id: If0f898a1e912fcd2095d8ba88b2b8046596e16ea
Diffstat (limited to 'binaryurp/source/bridge.cxx')
-rw-r--r-- | binaryurp/source/bridge.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 876e6f118634..1037fe2404d4 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -26,7 +26,6 @@ #include <memory> #include <vector> -#include "boost/noncopyable.hpp" #include "com/sun/star/bridge/InvalidProtocolChangeException.hpp" #include "com/sun/star/bridge/XBridge.hpp" #include "com/sun/star/bridge/XInstanceProvider.hpp" @@ -99,7 +98,7 @@ bool isThread(salhelper::Thread * thread) { return osl::Thread::getCurrentIdentifier() == thread->getIdentifier(); } -class AttachThread: private boost::noncopyable { +class AttachThread { public: explicit AttachThread(uno_ThreadPool threadPool); @@ -108,6 +107,9 @@ public: rtl::ByteSequence getTid() throw () { return tid_;} private: + AttachThread(const AttachThread&) SAL_DELETED_FUNCTION; + AttachThread& operator=(const AttachThread&) SAL_DELETED_FUNCTION; + uno_ThreadPool threadPool_; rtl::ByteSequence tid_; }; @@ -125,7 +127,7 @@ AttachThread::~AttachThread() { } -class PopOutgoingRequest: private boost::noncopyable { +class PopOutgoingRequest { public: PopOutgoingRequest( OutgoingRequests & requests, rtl::ByteSequence const & tid, @@ -136,6 +138,9 @@ public: void clear(); private: + PopOutgoingRequest(const PopOutgoingRequest&) SAL_DELETED_FUNCTION; + PopOutgoingRequest& operator=(const PopOutgoingRequest&) SAL_DELETED_FUNCTION; + OutgoingRequests & requests_; rtl::ByteSequence tid_; bool cleared_; |