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 /unotest | |
| 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 'unotest')
| -rw-r--r-- | unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx | 6 | ||||
| -rw-r--r-- | unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx index 964ce1396c7a..c34de5fd0a03 100644 --- a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx +++ b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx @@ -21,7 +21,6 @@ #include <string> #include <iostream> -#include "boost/noncopyable.hpp" #include "com/sun/star/uno/Exception.hpp" #include <cppuhelper/bootstrap.hxx> @@ -56,13 +55,16 @@ using namespace com::sun::star; //the first dispose. So lets setup the default context once before //all tests are run, and tear it down once after all have finished -class Prot : public CppUnit::Protector, private boost::noncopyable +class Prot : public CppUnit::Protector { public: Prot(); virtual ~Prot(); + Prot(const Prot&) = delete; + Prot& operator=(const Prot&) = delete; + virtual bool protect( CppUnit::Functor const & functor, CppUnit::ProtectorContext const & context) override; diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx index e1300b9598ee..820b32e248a4 100644 --- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx +++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx @@ -20,7 +20,6 @@ #include <string> #include <iostream> -#include "boost/noncopyable.hpp" #include "com/sun/star/uno/Any.hxx" #include "com/sun/star/uno/Exception.hpp" #include "cppuhelper/exc_hlp.hxx" @@ -44,13 +43,16 @@ std::string convert(OUString const & s16) { s8.getStr(), static_cast< std::string::size_type >(s8.getLength())); } -class Prot : public CppUnit::Protector, private boost::noncopyable +class Prot : public CppUnit::Protector { public: Prot() {} virtual ~Prot() {} + Prot(const Prot&) = delete; + Prot& operator=(const Prot&) = delete; + virtual bool protect( CppUnit::Functor const & functor, CppUnit::ProtectorContext const & context) override; |