summaryrefslogtreecommitdiff
path: root/binaryurp/source
diff options
context:
space:
mode:
Diffstat (limited to 'binaryurp/source')
-rw-r--r--binaryurp/source/bridge.cxx11
-rw-r--r--binaryurp/source/bridge.hxx7
-rw-r--r--binaryurp/source/bridgefactory.hxx8
-rw-r--r--binaryurp/source/cache.hxx6
-rw-r--r--binaryurp/source/incomingreply.hxx8
-rw-r--r--binaryurp/source/incomingrequest.cxx1
-rw-r--r--binaryurp/source/incomingrequest.hxx6
-rw-r--r--binaryurp/source/marshal.cxx1
-rw-r--r--binaryurp/source/marshal.hxx6
-rw-r--r--binaryurp/source/outgoingrequests.hxx6
-rw-r--r--binaryurp/source/proxy.hxx6
-rw-r--r--binaryurp/source/readerstate.hxx11
-rw-r--r--binaryurp/source/unmarshal.cxx1
-rw-r--r--binaryurp/source/unmarshal.hxx6
-rw-r--r--binaryurp/source/writerstate.hxx7
15 files changed, 57 insertions, 34 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_;
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index e4d9c5554262..232b02b53bed 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -27,7 +27,6 @@
#include <map>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/bridge/XBridge.hpp"
#include "com/sun/star/lang/XComponent.hpp"
#include "com/sun/star/uno/Reference.hxx"
@@ -69,8 +68,7 @@ namespace binaryurp {
class Bridge:
public cppu::WeakImplHelper2<
- com::sun::star::bridge::XBridge, com::sun::star::lang::XComponent >,
- private boost::noncopyable
+ com::sun::star::bridge::XBridge, com::sun::star::lang::XComponent >
{
public:
Bridge(
@@ -171,6 +169,9 @@ public:
bool isCurrentContextMode();
private:
+ Bridge(const Bridge&) SAL_DELETED_FUNCTION;
+ Bridge& operator=(const Bridge&) SAL_DELETED_FUNCTION;
+
virtual ~Bridge();
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index 2083eeb83b6b..27ec27429d07 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -26,7 +26,6 @@
#include <list>
#include <map>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/bridge/XBridgeFactory2.hpp"
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/uno/Exception.hpp"
@@ -55,9 +54,7 @@ typedef
com::sun::star::bridge::XBridgeFactory2 >
BridgeFactoryBase;
-class BridgeFactory:
- private cppu::BaseMutex, public BridgeFactoryBase,
- private boost::noncopyable
+class BridgeFactory : private cppu::BaseMutex, public BridgeFactoryBase
{
public:
static com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
@@ -78,6 +75,9 @@ public:
using BridgeFactoryBase::release;
private:
+ BridgeFactory(const BridgeFactory&) SAL_DELETED_FUNCTION;
+ BridgeFactory& operator=(const BridgeFactory&) SAL_DELETED_FUNCTION;
+
explicit BridgeFactory(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const & context);
diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx
index 7cbb30392a97..97e246ec2655 100644
--- a/binaryurp/source/cache.hxx
+++ b/binaryurp/source/cache.hxx
@@ -27,7 +27,6 @@
#include <map>
#include <list>
-#include "boost/noncopyable.hpp"
#include "sal/types.h"
namespace binaryurp {
@@ -38,7 +37,7 @@ enum { size = 256, ignore = 0xFFFF };
}
-template< typename T > class Cache : private boost::noncopyable {
+template< typename T > class Cache {
public:
typedef sal_uInt16 IdxType;
@@ -81,6 +80,9 @@ public:
}
private:
+ Cache(const Cache&) SAL_DELETED_FUNCTION;
+ Cache& operator=(const Cache&) SAL_DELETED_FUNCTION;
+
typedef std::list<T> LruList; // last recently used list
typedef typename LruList::iterator LruListIt;
struct CmpT{ bool operator()( const LruListIt& rA, const LruListIt& rB) const { return (*rA<*rB);}};
diff --git a/binaryurp/source/incomingreply.hxx b/binaryurp/source/incomingreply.hxx
index 9e85c1686a35..7584ded5c3fa 100644
--- a/binaryurp/source/incomingreply.hxx
+++ b/binaryurp/source/incomingreply.hxx
@@ -24,13 +24,15 @@
#include <vector>
-#include "boost/noncopyable.hpp"
-
#include "binaryany.hxx"
namespace binaryurp {
-struct IncomingReply: private boost::noncopyable {
+struct IncomingReply {
+private:
+ IncomingReply(const IncomingReply&) SAL_DELETED_FUNCTION;
+ IncomingReply& operator=(const IncomingReply&) SAL_DELETED_FUNCTION;
+public:
IncomingReply(
bool theException, BinaryAny const & theReturnValue,
std::vector< BinaryAny > const & theOutArguments):
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index 30b876ef81c8..a239a09bd843 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -22,7 +22,6 @@
#include <list>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/bridge/XInstanceProvider.hpp"
#include "cppuhelper/exc_hlp.hxx"
#include "rtl/byteseq.hxx"
diff --git a/binaryurp/source/incomingrequest.hxx b/binaryurp/source/incomingrequest.hxx
index a14c295d5d51..0b8c4d13e249 100644
--- a/binaryurp/source/incomingrequest.hxx
+++ b/binaryurp/source/incomingrequest.hxx
@@ -24,7 +24,6 @@
#include <vector>
-#include "boost/noncopyable.hpp"
#include "rtl/byteseq.hxx"
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
@@ -39,7 +38,10 @@ namespace binaryurp {
namespace binaryurp {
-class IncomingRequest: private boost::noncopyable {
+class IncomingRequest {
+private:
+ IncomingRequest(const IncomingRequest&) SAL_DELETED_FUNCTION;
+ IncomingRequest& operator=(const IncomingRequest&) SAL_DELETED_FUNCTION;
public:
IncomingRequest(
rtl::Reference< Bridge > const & bridge, rtl::ByteSequence const & tid,
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index ad5f2b882a63..5904557cc1e8 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -22,7 +22,6 @@
#include <cassert>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/Sequence.hxx"
diff --git a/binaryurp/source/marshal.hxx b/binaryurp/source/marshal.hxx
index 953b3ff666f6..da78a787839a 100644
--- a/binaryurp/source/marshal.hxx
+++ b/binaryurp/source/marshal.hxx
@@ -24,7 +24,6 @@
#include <vector>
-#include "boost/noncopyable.hpp"
#include "rtl/byteseq.hxx"
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
@@ -39,7 +38,7 @@ namespace binaryurp {
namespace binaryurp {
-class Marshal: private boost::noncopyable {
+class Marshal {
public:
Marshal(rtl::Reference< Bridge > const & bridge, WriterState & state);
@@ -69,6 +68,9 @@ public:
std::vector< unsigned char > * buffer, rtl::ByteSequence const & tid);
private:
+ Marshal(const Marshal&) SAL_DELETED_FUNCTION;
+ Marshal& operator=(const Marshal&) SAL_DELETED_FUNCTION;
+
void writeValue(
std::vector< unsigned char > * buffer,
com::sun::star::uno::TypeDescription const & type, void const * value);
diff --git a/binaryurp/source/outgoingrequests.hxx b/binaryurp/source/outgoingrequests.hxx
index 564757256d7a..e3c92bd00b91 100644
--- a/binaryurp/source/outgoingrequests.hxx
+++ b/binaryurp/source/outgoingrequests.hxx
@@ -25,7 +25,6 @@
#include <map>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "osl/mutex.hxx"
namespace binaryurp { struct OutgoingRequest; }
@@ -33,7 +32,7 @@ namespace rtl { class ByteSequence; }
namespace binaryurp {
-class OutgoingRequests: private boost::noncopyable {
+class OutgoingRequests {
public:
OutgoingRequests();
@@ -46,6 +45,9 @@ public:
void pop(rtl::ByteSequence const & tid) throw ();
private:
+ OutgoingRequests(const OutgoingRequests&) SAL_DELETED_FUNCTION;
+ OutgoingRequests& operator=(const OutgoingRequests&) SAL_DELETED_FUNCTION;
+
typedef std::map< rtl::ByteSequence, std::vector< OutgoingRequest > > Map;
osl::Mutex mutex_;
diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx
index b7491cbd691e..7a758dd3e23d 100644
--- a/binaryurp/source/proxy.hxx
+++ b/binaryurp/source/proxy.hxx
@@ -22,7 +22,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include "osl/interlck.h"
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
@@ -38,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace uno {
namespace binaryurp {
-class Proxy: public uno_Interface, private boost::noncopyable {
+class Proxy: public uno_Interface {
public:
Proxy(
rtl::Reference< Bridge > const & bridge, OUString const & oid,
@@ -64,6 +63,9 @@ public:
OUString * oid);
private:
+ Proxy(const Proxy&) SAL_DELETED_FUNCTION;
+ Proxy& operator=(const Proxy&) SAL_DELETED_FUNCTION;
+
~Proxy();
void do_dispatch_throw(
diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx
index 21ba8503c1d5..1ce1d5a4b783 100644
--- a/binaryurp/source/readerstate.hxx
+++ b/binaryurp/source/readerstate.hxx
@@ -22,7 +22,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include "rtl/byteseq.hxx"
#include "rtl/ustring.hxx"
#include "typelib/typedescription.hxx"
@@ -31,11 +30,15 @@
namespace binaryurp {
-struct ReaderState: private boost::noncopyable {
- com::sun::star::uno::TypeDescription typeCache[cache::size];
+struct ReaderState {
+private:
+ ReaderState(const ReaderState&) SAL_DELETED_FUNCTION;
+ ReaderState& operator=(const ReaderState&) SAL_DELETED_FUNCTION;
+public:
+ ReaderState() {}
+ com::sun::star::uno::TypeDescription typeCache[cache::size];
OUString oidCache[cache::size];
-
rtl::ByteSequence tidCache[cache::size];
};
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index f34bfd3b4eb6..ee996e1e9636 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -24,7 +24,6 @@
#include <new>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/io/IOException.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx
index 8494731ec6c3..3c523aa3f637 100644
--- a/binaryurp/source/unmarshal.hxx
+++ b/binaryurp/source/unmarshal.hxx
@@ -24,7 +24,6 @@
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Sequence.hxx"
#include "rtl/ref.hxx"
#include "sal/types.h"
@@ -41,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace uno {
namespace binaryurp {
-class Unmarshal: private boost::noncopyable {
+class Unmarshal {
public:
Unmarshal(
rtl::Reference< Bridge > const & bridge, ReaderState & state,
@@ -66,6 +65,9 @@ public:
void done() const;
private:
+ Unmarshal(const Unmarshal&) SAL_DELETED_FUNCTION;
+ Unmarshal& operator=(const Unmarshal&) SAL_DELETED_FUNCTION;
+
void check(sal_Int32 size) const;
sal_uInt32 readCompressed();
diff --git a/binaryurp/source/writerstate.hxx b/binaryurp/source/writerstate.hxx
index 859a09271805..7ae457c46c8e 100644
--- a/binaryurp/source/writerstate.hxx
+++ b/binaryurp/source/writerstate.hxx
@@ -22,7 +22,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include "rtl/byteseq.hxx"
#include "rtl/ustring.hxx"
#include "typelib/typedescription.hxx"
@@ -31,7 +30,11 @@
namespace binaryurp {
-struct WriterState: private boost::noncopyable {
+struct WriterState {
+private:
+ WriterState(const WriterState&) SAL_DELETED_FUNCTION;
+ WriterState& operator=(const WriterState&) SAL_DELETED_FUNCTION;
+public:
WriterState():
typeCache(cache::size), oidCache(cache::size), tidCache(cache::size) {}