From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Sep 2016 13:09:01 +0200 Subject: 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 --- include/comphelper/asyncnotification.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/comphelper/asyncnotification.hxx') diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx index a8439f8d36e7..f512b42f31b0 100644 --- a/include/comphelper/asyncnotification.hxx +++ b/include/comphelper/asyncnotification.hxx @@ -41,7 +41,7 @@ namespace comphelper AnyEvent(); protected: - virtual ~AnyEvent(); + virtual ~AnyEvent() override; private: AnyEvent( AnyEvent& ) = delete; @@ -147,7 +147,7 @@ namespace comphelper { private: - SAL_DLLPRIVATE virtual ~AsyncEventNotifier(); + SAL_DLLPRIVATE virtual ~AsyncEventNotifier() override; SAL_DLLPRIVATE virtual void execute() override; @@ -178,7 +178,7 @@ namespace comphelper public: // only public so shared_ptr finds it - SAL_DLLPRIVATE virtual ~AsyncEventNotifierAutoJoin(); + SAL_DLLPRIVATE virtual ~AsyncEventNotifierAutoJoin() override; static std::shared_ptr newAsyncEventNotifierAutoJoin(char const* name); -- cgit