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 /include/jvmaccess | |
| parent | avoid loading all calendars of a locale (diff) | |
| download | core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.tar.gz core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.zip | |
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 'include/jvmaccess')
| -rw-r--r-- | include/jvmaccess/unovirtualmachine.hxx | 2 | ||||
| -rw-r--r-- | include/jvmaccess/virtualmachine.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx index 8021814dc44c..4c409d53d418 100644 --- a/include/jvmaccess/unovirtualmachine.hxx +++ b/include/jvmaccess/unovirtualmachine.hxx @@ -91,7 +91,7 @@ private: UnoVirtualMachine(UnoVirtualMachine &) = delete; void operator =(UnoVirtualMachine &) = delete; - virtual ~UnoVirtualMachine(); + virtual ~UnoVirtualMachine() override; rtl::Reference< jvmaccess::VirtualMachine > m_virtualMachine; void * m_classLoader; diff --git a/include/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx index b27ce89840bb..4f805763459f 100644 --- a/include/jvmaccess/virtualmachine.hxx +++ b/include/jvmaccess/virtualmachine.hxx @@ -131,7 +131,7 @@ private: VirtualMachine(VirtualMachine &) = delete; void operator =(VirtualMachine) = delete; - virtual ~VirtualMachine(); + virtual ~VirtualMachine() override; JNIEnv * attachThread(bool * pAttached) const; |