summaryrefslogtreecommitdiff
path: root/basic/source/runtime/dllmgr-x64.cxx
diff options
context:
space:
mode:
authorSteven Guo <steventimothyguo@gmail.com>2016-03-06 21:19:25 -0800
committerMichael Stahl <mstahl@redhat.com>2016-03-08 16:10:46 +0000
commit5819268ad709f52417b59421260e86e9c7e90f75 (patch)
treef9fe039fa103a68500932bef2fa5c71e9983dc2f /basic/source/runtime/dllmgr-x64.cxx
parentb9a25b254b93568607285f9396c87f4286d7132e (diff)
tdf#94306 Replace boost::noncopyable with plain C++11 deleted copy ctors
Replaced boost::noncopyable with plain C++11 deleted copy ctors in /basic/* files. Change-Id: I9c0eb0a51ec5cb25c88c72b55f42864e73006e6b Reviewed-on: https://gerrit.libreoffice.org/22969 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'basic/source/runtime/dllmgr-x64.cxx')
-rw-r--r--basic/source/runtime/dllmgr-x64.cxx13
1 files changed, 10 insertions, 3 deletions
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 48e5cc736f89..11a514ba5ef1 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -38,7 +38,6 @@
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <boost/noncopyable.hpp>
#undef max
@@ -102,8 +101,12 @@ struct StringData: public UnmarshalData {
bool special;
};
-class MarshalData: private boost::noncopyable {
+class MarshalData {
public:
+ MarshalData() = default;
+ MarshalData(const MarshalData&) = delete;
+ const MarshalData& operator=(const MarshalData&) = delete;
+
std::vector< char > * newBlob() {
blobs_.push_front(std::vector< char >());
return &blobs_.front();
@@ -714,11 +717,15 @@ OUString fullDllName(OUString const & name) {
}
-struct SbiDllMgr::Impl: private boost::noncopyable {
+struct SbiDllMgr::Impl{
private:
typedef std::map< OUString, ::rtl::Reference< Dll > > Dlls;
public:
+ Impl() = default;
+ Impl(const Impl&) = delete;
+ const Impl& operator=(const Impl&) = delete;
+
Dll * getDll(OUString const & name);
Dlls dlls;