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 /stoc/source/javavm | |
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 'stoc/source/javavm')
-rw-r--r-- | stoc/source/javavm/interact.cxx | 11 | ||||
-rw-r--r-- | stoc/source/javavm/javavm.cxx | 12 |
2 files changed, 14 insertions, 9 deletions
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx index cb3f08018402..c2962d021e46 100644 --- a/stoc/source/javavm/interact.cxx +++ b/stoc/source/javavm/interact.cxx @@ -20,7 +20,6 @@ #include "interact.hxx" -#include <boost/noncopyable.hpp> #include <com/sun/star/java/JavaDisabledException.hpp> #include <com/sun/star/java/JavaVMCreationFailureException.hpp> #include <com/sun/star/task/XInteractionAbort.hpp> @@ -34,11 +33,12 @@ using stoc_javavm::InteractionRequest; namespace { class AbortContinuation: - public cppu::WeakImplHelper<css::task::XInteractionAbort>, - private boost::noncopyable + public cppu::WeakImplHelper<css::task::XInteractionAbort> { public: inline AbortContinuation() {} + AbortContinuation(const AbortContinuation&) = delete; + AbortContinuation& operator=(const AbortContinuation&)= delete; virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override {} @@ -49,11 +49,12 @@ private: } class InteractionRequest::RetryContinuation: - public cppu::WeakImplHelper<css::task::XInteractionRetry>, - private boost::noncopyable + public cppu::WeakImplHelper<css::task::XInteractionRetry> { public: inline RetryContinuation(): m_bSelected(false) {} + RetryContinuation(const RetryContinuation&) = delete; + RetryContinuation& operator=(const RetryContinuation&) = delete; virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override; diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 7a1e08c27f16..683e6ef9b00f 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -78,7 +78,6 @@ #include <time.h> #include <memory> #include <vector> -#include <boost/noncopyable.hpp> // Properties of the javavm can be put // as a komma separated list in this @@ -117,8 +116,7 @@ class NoJavaIniException: public css::uno::Exception }; class SingletonFactory: - private cppu::WeakImplHelper< css::lang::XEventListener >, - private boost::noncopyable + private cppu::WeakImplHelper< css::lang::XEventListener > { public: static css::uno::Reference< css::uno::XInterface > getSingleton( @@ -129,6 +127,9 @@ private: virtual inline ~SingletonFactory() {} + SingletonFactory(const SingletonFactory&) = delete; + SingletonFactory& operator=(const SingletonFactory&) = delete; + virtual void SAL_CALL disposing(css::lang::EventObject const &) throw (css::uno::RuntimeException, std::exception) override; @@ -530,7 +531,7 @@ void initVMConfiguration( setTimeZone(pjvm); } -class DetachCurrentThread: private boost::noncopyable { +class DetachCurrentThread { public: explicit DetachCurrentThread(JavaVM * jvm): m_jvm(jvm) {} @@ -540,6 +541,9 @@ public: } } + DetachCurrentThread(const DetachCurrentThread&) = delete; + DetachCurrentThread& operator=(const DetachCurrentThread&) = delete; + private: JavaVM * m_jvm; }; |