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 /comphelper/source/misc/instancelocker.hxx | |
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 'comphelper/source/misc/instancelocker.hxx')
-rw-r--r-- | comphelper/source/misc/instancelocker.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index 2107d7a6912d..6960e1da60ef 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -54,7 +54,7 @@ class OInstanceLocker : public ::cppu::WeakImplHelper< css::lang::XComponent, public: explicit OInstanceLocker(); - virtual ~OInstanceLocker(); + virtual ~OInstanceLocker() override; // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; @@ -92,7 +92,7 @@ public: sal_Int32 nMode, const css::uno::Reference< css::embed::XActionsApproval >& rApproval ); - virtual ~OLockListener(); + virtual ~OLockListener() override; void Init(); void Dispose(); |