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 /jvmfwk | |
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 'jvmfwk')
-rw-r--r-- | jvmfwk/inc/vendorbase.hxx | 2 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/source/framework.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx index 6e50892a773f..2a24c9590858 100644 --- a/jvmfwk/inc/vendorbase.hxx +++ b/jvmfwk/inc/vendorbase.hxx @@ -89,7 +89,7 @@ public: MalformedVersionException(const MalformedVersionException &); - virtual ~MalformedVersionException(); + virtual ~MalformedVersionException() override; MalformedVersionException & operator =(const MalformedVersionException &); }; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index f1d33b1313ee..9fe444c0bc32 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -322,7 +322,7 @@ class AsynchReader: public salhelper::Thread bool m_bDone; FileHandleGuard m_aGuard; - virtual ~AsynchReader() {} + virtual ~AsynchReader() override {} void execute() override; public: diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx index 5ae25d5286c5..9d152c8243ca 100644 --- a/jvmfwk/source/framework.hxx +++ b/jvmfwk/source/framework.hxx @@ -110,7 +110,7 @@ public: errorCode(err), message(msg) { } - virtual ~FrameworkException() throw () {} + virtual ~FrameworkException() throw () override {} javaFrameworkError errorCode; OString message; }; |