diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-03-24 22:47:56 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-03-24 23:07:31 +0100 |
commit | 9cdfc240324679b1214ee175a3ed233f4cf4ecef (patch) | |
tree | 357ece051fe265c11bc913025cbdbcb8ee721e0e /unoxml/source/rdf/librdf_repository.cxx | |
parent | a764d03e0cf34bb11f82fbb44850feda312ce24b (diff) |
unordf: replace boost::noncopyable with C++11 delete
Change-Id: I996ca0589db8b73db045c87bbecfab03be9dbaef
Diffstat (limited to 'unoxml/source/rdf/librdf_repository.cxx')
-rw-r--r-- | unoxml/source/rdf/librdf_repository.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 04e0f7f5c35b..3b3a1804a1ec 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -28,7 +28,6 @@ #include <functional> #include <algorithm> -#include <boost/noncopyable.hpp> #include <boost/shared_array.hpp> #include <boost/optional.hpp> @@ -261,7 +260,6 @@ private: /** implements the repository service. */ class librdf_Repository: - private boost::noncopyable, // private ::cppu::BaseMutex, public ::cppu::WeakImplHelper< lang::XServiceInfo, @@ -402,6 +400,9 @@ public: private: + librdf_Repository(librdf_Repository const&) = delete; + librdf_Repository& operator=(librdf_Repository const&) = delete; + /// this is const, no need to lock m_aMutex to access it uno::Reference< uno::XComponentContext > const m_xContext; @@ -443,7 +444,6 @@ private: an XEnumeration of statements. */ class librdf_GraphResult: - private boost::noncopyable, public ::cppu::WeakImplHelper< container::XEnumeration> { @@ -478,6 +478,10 @@ public: lang::WrappedTargetException, std::exception) override; private: + + librdf_GraphResult(librdf_GraphResult const&) = delete; + librdf_GraphResult& operator=(librdf_GraphResult const&) = delete; + // NB: this is not a weak pointer: streams _must_ be deleted before the // storage they point into, so we keep the repository alive here // also, sequence is important: the stream must be destroyed first. @@ -555,7 +559,6 @@ throw (uno::RuntimeException, container::NoSuchElementException, /** result of tuple queries ("SELECT"). */ class librdf_QuerySelectResult: - private boost::noncopyable, public ::cppu::WeakImplHelper< rdf::XQuerySelectResult> { @@ -594,6 +597,9 @@ public: private: + librdf_QuerySelectResult(librdf_QuerySelectResult const&) = delete; + librdf_QuerySelectResult& operator=(librdf_QuerySelectResult const&) = delete; + // NB: this is not a weak pointer: streams _must_ be deleted before the // storage they point into, so we keep the repository alive here // also, sequence is important: the stream must be destroyed first. @@ -679,7 +685,6 @@ librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException, std::e /** represents a named graph, and forwards all the work to repository. */ class librdf_NamedGraph: - private boost::noncopyable, public ::cppu::WeakImplHelper< rdf::XNamedGraph> { @@ -730,6 +735,9 @@ public: private: + librdf_NamedGraph(librdf_NamedGraph const&) = delete; + librdf_NamedGraph& operator=(librdf_NamedGraph const&) = delete; + /// weak reference: this is needed to check if m_pRep is valid uno::WeakReference< rdf::XRepository > const m_wRep; librdf_Repository *const m_pRep; |