diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /unoxml/source/rdf/librdf_repository.cxx | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'unoxml/source/rdf/librdf_repository.cxx')
-rw-r--r-- | unoxml/source/rdf/librdf_repository.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 9e89c7914969..8dedfd37f341 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -269,7 +269,7 @@ public: explicit librdf_Repository( uno::Reference< uno::XComponentContext > const & i_xContext); - virtual ~librdf_Repository(); + virtual ~librdf_Repository() override; // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() @@ -461,7 +461,7 @@ public: , m_pStream(i_pStream) { }; - virtual ~librdf_GraphResult() + virtual ~librdf_GraphResult() override { ::osl::MutexGuard g(m_rMutex); // lock mutex when destroying members const_cast<std::shared_ptr<librdf_stream>& >(m_pStream).reset(); @@ -575,7 +575,7 @@ public: , m_BindingNames(i_rBindingNames) { }; - virtual ~librdf_QuerySelectResult() + virtual ~librdf_QuerySelectResult() override { ::osl::MutexGuard g(m_rMutex); // lock mutex when destroying members const_cast<std::shared_ptr<librdf_query_results>& >(m_pQueryResult) @@ -695,7 +695,7 @@ public: , m_xName(i_xName) { }; - virtual ~librdf_NamedGraph() {} + virtual ~librdf_NamedGraph() override {} // css::rdf::XNode: virtual OUString SAL_CALL getStringValue() |