summaryrefslogtreecommitdiff
path: root/codemaker
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-07 20:26:54 +0200
committerMichael Stahl <mstahl@redhat.com>2016-04-08 09:32:48 +0000
commit98d7b02f2b69f2f88a03054183933df7f190017d (patch)
tree690b9494931814bc3ea0d80391d0af04ee380a55 /codemaker
parentb7bf06d5d6f640df1304b605a2eaa5276f998dcb (diff)
tdf#94306 replace boost::noncopyable in cppuhelper
and related modules. Replace with C++11 delete copy-constructur and copy-assignment. Change-Id: I18aa9fe4ff696f9b5472cbe4cd0097cb174618b7 Reviewed-on: https://gerrit.libreoffice.org/23904 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'codemaker')
-rw-r--r--codemaker/source/cppumaker/cpputype.cxx10
-rw-r--r--codemaker/source/cppumaker/dependencies.hxx6
2 files changed, 11 insertions, 5 deletions
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 718940596f6f..0c7be86ea24d 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -26,7 +26,6 @@
#include <vector>
#include <iostream>
-#include "boost/noncopyable.hpp"
#include "rtl/alloc.h"
#include "rtl/ref.hxx"
#include "rtl/ustrbuf.hxx"
@@ -146,13 +145,16 @@ bool isBootstrapType(OUString const & name) {
return false;
}
-class CppuType: private boost::noncopyable {
+class CppuType {
public:
CppuType(
OUString const & name, rtl::Reference< TypeManager > const & typeMgr);
virtual ~CppuType() {}
+ CppuType(const CppuType&) = delete;
+ const CppuType& operator=(const CppuType&) = delete;
+
void dump(CppuOptions const & options);
bool dumpFile(
@@ -1030,12 +1032,14 @@ void dumpDeprecation(FileStream & out, bool deprecated) {
}
}
-class BaseOffset: private boost::noncopyable {
+class BaseOffset {
public:
BaseOffset(
rtl::Reference< TypeManager > const & manager,
rtl::Reference< unoidl::InterfaceTypeEntity > const & entity):
manager_(manager), offset_(0) { calculateBases(entity); }
+ BaseOffset(const BaseOffset&) = delete;
+ const BaseOffset& operator=(const BaseOffset&) = delete;
sal_Int32 get() const { return offset_; }
diff --git a/codemaker/source/cppumaker/dependencies.hxx b/codemaker/source/cppumaker/dependencies.hxx
index afd902bdd491..e1513a3250cc 100644
--- a/codemaker/source/cppumaker/dependencies.hxx
+++ b/codemaker/source/cppumaker/dependencies.hxx
@@ -24,7 +24,6 @@
#include <map>
-#include "boost/noncopyable.hpp"
#include "rtl/ref.hxx"
namespace rtl { class OUString; }
@@ -39,7 +38,7 @@ namespace codemaker { namespace cppumaker {
<p>This class is not multi-thread&ndash;safe.</p>
*/
-class Dependencies: private boost::noncopyable {
+class Dependencies {
public:
/**
Flags to distinguish whether or not one entity depends on another entity
@@ -66,6 +65,9 @@ public:
~Dependencies();
+ Dependencies(const Dependencies&) = delete;
+ const Dependencies& operator=(const Dependencies&) = delete;
+
Map const & getMap() const { return m_map; }
bool hasBooleanDependency() const { return m_booleanDependency; }