diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-10 21:41:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-11 07:15:35 +0000 |
| commit | c210bf4510585b554e0e9a371f27fa27e2874762 (patch) | |
| tree | 62f8c45ab415da97af398508e3ea64329268e7a3 /sal/cppunittester | |
| parent | cf81f3ba0602eeffad8907a1bb9cdd24e62c2d1e (diff) | |
tdf#94306 replace boost::noncopyable r.. to sdext
... in modules reportdesign to sdext
Replace with C++11 delete copy-constructur and
copy-assignment.
Remove boost/noncopyable.hpp includes.
Make some overloaded ctors explicit
(most in sd slidesorter).
Add deleted copy-assignment in sc/inc/chart2uno.hxx.
Change-Id: I21d4209f0ddb00063ca827474516a05ab4bb2f9a
Reviewed-on: https://gerrit.libreoffice.org/23970
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sal/cppunittester')
| -rw-r--r-- | sal/cppunittester/cppunittester.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 30347c178c16..3beb9013093c 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -52,7 +52,6 @@ #include "cppunit/plugin/DynamicLibraryManagerException.h" #include "cppunit/portability/Stream.h" -#include "boost/noncopyable.hpp" #include <memory> #include <boost/algorithm/string.hpp> @@ -86,9 +85,11 @@ std::string convertLazy(rtl::OUString const & s16) { //Output how long each test took class TimingListener : public CppUnit::TestListener - , private boost::noncopyable { public: + TimingListener(const TimingListener&) = delete; + TimingListener& operator=(const TimingListener&) = delete; + void startTest( CppUnit::Test *) override { m_nStartTime = osl_getGlobalTimer(); @@ -112,9 +113,11 @@ private: // have a useful value to identify the source class EyecatcherListener : public CppUnit::TestListener - , private boost::noncopyable { public: + EyecatcherListener() = default; + EyecatcherListener(const EyecatcherListener&) = delete; + EyecatcherListener& operator=(const EyecatcherListener&) = delete; void startTest( CppUnit::Test* test) override { std::unique_ptr<char[]> tn(new char [ test->getName().length() + 2 ]); @@ -209,7 +212,6 @@ void addRecursiveTests(const std::vector<std::string>& test_names, CppUnit::Test //exception before falling over and dying class CPPUNIT_API ProtectedFixtureFunctor : public CppUnit::Functor - , private boost::noncopyable { private: const std::string &testlib; @@ -224,6 +226,8 @@ public: , result(result_) { } + ProtectedFixtureFunctor(const ProtectedFixtureFunctor&) = delete; + ProtectedFixtureFunctor& operator=(const ProtectedFixtureFunctor&) = delete; bool run() const { #ifdef DISABLE_DYNLOADING |