From 97abbec95665b43a9a09e10a0fb31854cdbd5c0d Mon Sep 17 00:00:00 2001
From: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Date: Wed, 13 Apr 2016 10:11:37 +0200
Subject: tdf#94306 replace boost::noncopyable in stoc to xmlsec..

Replace with C++11 delete copy-constructur
and copy-assignment.
Remove boost/noncopyable.hpp includes.
Add missing default ctors.

With this commit there should be no users
of boost::noncopyable left.

Change-Id: I6b1e47824912a6a80cc3f00f34938ebc048d8975
Reviewed-on: https://gerrit.libreoffice.org/24051
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
---
 store/source/lockbyte.cxx | 19 ++++++++++++-------
 store/source/storbase.cxx |  7 ++++---
 store/source/storcach.cxx |  2 --
 store/source/storcach.hxx |  7 ++++---
 4 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'store')

diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index beb21b1be937..0bb42b552096 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -19,7 +19,6 @@
 
 #include "lockbyte.hxx"
 
-#include "boost/noncopyable.hpp"
 #include "sal/types.h"
 #include "osl/diagnose.h"
 #include "osl/file.h"
@@ -278,8 +277,7 @@ struct FileHandle
 
 class FileLockBytes :
     public store::OStoreObject,
-    public store::ILockBytes,
-    private boost::noncopyable
+    public store::ILockBytes
 {
     /** Representation.
      */
@@ -309,6 +307,9 @@ public:
      */
     explicit FileLockBytes (FileHandle & rFile);
 
+    FileLockBytes(const FileLockBytes&) = delete;
+    FileLockBytes& operator=(const FileLockBytes&) = delete;
+
 protected:
     /** Destruction.
      */
@@ -500,8 +501,7 @@ struct FileMapping
 class MappedLockBytes :
     public store::OStoreObject,
     public store::PageData::Allocator,
-    public store::ILockBytes,
-    private boost::noncopyable
+    public store::ILockBytes
 {
     /** Representation.
      */
@@ -535,6 +535,9 @@ public:
      */
     explicit MappedLockBytes (FileMapping & rMapping);
 
+    MappedLockBytes(const MappedLockBytes&) = delete;
+    MappedLockBytes& operator=(const MappedLockBytes&) = delete;
+
 protected:
     /* Destruction.
      */
@@ -642,8 +645,7 @@ namespace store
 
 class MemoryLockBytes :
     public store::OStoreObject,
-    public store::ILockBytes,
-    private boost::noncopyable
+    public store::ILockBytes
 {
     /** Representation.
      */
@@ -671,6 +673,9 @@ public:
      */
     MemoryLockBytes();
 
+    MemoryLockBytes(const MemoryLockBytes&) = delete;
+    MemoryLockBytes& operator=(const MemoryLockBytes&) = delete;
+
 protected:
     /** Destruction.
      */
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index df505d8d54c2..2515de508d78 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -19,7 +19,6 @@
 
 #include "storbase.hxx"
 
-#include "boost/noncopyable.hpp"
 #include "sal/types.h"
 #include "rtl/alloc.h"
 #include "rtl/ref.hxx"
@@ -75,14 +74,16 @@ namespace store
 
 class PageData::Allocator_Impl :
     public store::OStoreObject,
-    public store::PageData::Allocator,
-    private boost::noncopyable
+    public store::PageData::Allocator
 {
 public:
     /** Construction (two phase).
      */
     Allocator_Impl();
 
+    Allocator_Impl(const Allocator_Impl&) = delete;
+    Allocator_Impl& operator=(const Allocator_Impl&) = delete;
+
     storeError initialize (sal_uInt16 nPageSize);
 
 protected:
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index af4ec4ce60d2..1f5e147c29a8 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -19,8 +19,6 @@
 
 #include "sal/config.h"
 
-#include "boost/noncopyable.hpp"
-
 #include "storcach.hxx"
 
 #include "sal/log.hxx"
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index 446d39c04478..bc53fd6c6566 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -26,7 +26,6 @@
 #include "store/types.h"
 #include "storbase.hxx"
 #include "object.hxx"
-#include "boost/noncopyable.hpp"
 
 namespace store
 {
@@ -40,8 +39,7 @@ struct Entry;
  *======================================================================*/
 
 class PageCache :
-    public store::OStoreObject,
-    private boost::noncopyable
+    public store::OStoreObject
 {
     // Representation
     static size_t const theTableSize = 32;
@@ -73,6 +71,9 @@ public:
     // Construction
     explicit PageCache (sal_uInt16 nPageSize);
 
+    PageCache(const PageCache&) = delete;
+    PageCache& operator=(const PageCache&) = delete;
+
     /** load.
      */
     storeError lookupPageAt (
-- 
cgit v1.2.3