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 /desktop/inc | |
| 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 'desktop/inc')
| -rw-r--r-- | desktop/inc/app.hxx | 2 | ||||
| -rw-r--r-- | desktop/inc/lib/init.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index c90bfdb0d7d7..f7e7e9265560 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -70,7 +70,7 @@ class Desktop : public Application }; Desktop(); - virtual ~Desktop(); + virtual ~Desktop() override; virtual int Main( ) override; virtual void Init() override; virtual void InitFinished() override; diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index db281688c2f9..e202344450ff 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -32,7 +32,7 @@ namespace desktop { { public: explicit CallbackFlushHandler(LibreOfficeKitDocument* pDocument, LibreOfficeKitCallback pCallback, void* pData); - virtual ~CallbackFlushHandler(); + virtual ~CallbackFlushHandler() override; virtual void Invoke() override; static void callback(const int type, const char* payload, void* data); void queue(const int type, const char* data); |