diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-13 10:11:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-04-13 11:19:04 +0000 |
| commit | 97abbec95665b43a9a09e10a0fb31854cdbd5c0d (patch) | |
| tree | b6917d80775c411a5480febd77b89fb256203b6a /svl/source/misc | |
| parent | 9a2ff36b51f86ca3ade8093d7698314c0d3db6a6 (diff) | |
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>
Diffstat (limited to 'svl/source/misc')
| -rw-r--r-- | svl/source/misc/getstringresource.cxx | 6 | ||||
| -rw-r--r-- | svl/source/misc/inethist.cxx | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx index 6f0de30bc450..fe18e9635c35 100644 --- a/svl/source/misc/getstringresource.cxx +++ b/svl/source/misc/getstringresource.cxx @@ -21,7 +21,6 @@ #include <map> #include <memory> -#include <boost/noncopyable.hpp> #include <i18nlangtag/languagetag.hxx> #include <rtl/instance.hxx> #include <rtl/ustrbuf.hxx> @@ -34,9 +33,12 @@ namespace { -class ResMgrMap: private boost::noncopyable { +class ResMgrMap { public: + ResMgrMap() = default; ~ResMgrMap(); + ResMgrMap(const ResMgrMap&) = delete; + ResMgrMap& operator=(const ResMgrMap&) = delete; SimpleResMgr * get(LanguageTag const & locale); diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 09fec7d6a65c..8db4ac91144f 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -22,7 +22,6 @@ #include <algorithm> #include <string.h> -#include <boost/noncopyable.hpp> #include <rtl/instance.hxx> #include <rtl/crc.h> #include <osl/diagnose.h> @@ -41,7 +40,7 @@ #define INETHIST_SIZE_LIMIT 1024 #define INETHIST_MAGIC_HEAD 0x484D4849UL -class INetURLHistory_Impl: private boost::noncopyable +class INetURLHistory_Impl { struct head_entry { @@ -156,6 +155,8 @@ class INetURLHistory_Impl: private boost::noncopyable public: INetURLHistory_Impl(); ~INetURLHistory_Impl(); + INetURLHistory_Impl(const INetURLHistory_Impl&) = delete; + INetURLHistory_Impl& operator=(const INetURLHistory_Impl&) = delete; /** putUrl/queryUrl. */ |