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 /pyuno | |
| 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 'pyuno')
| -rw-r--r-- | pyuno/source/module/pyuno_gc.cxx | 2 | ||||
| -rw-r--r-- | pyuno/source/module/pyuno_impl.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyuno/source/module/pyuno_gc.cxx b/pyuno/source/module/pyuno_gc.cxx index d65be77402fa..8293b689e9ca 100644 --- a/pyuno/source/module/pyuno_gc.cxx +++ b/pyuno/source/module/pyuno_gc.cxx @@ -49,7 +49,7 @@ public: GCThread( PyInterpreterState *interpreter, PyObject * object ); private: - virtual ~GCThread() {} + virtual ~GCThread() override {} virtual void execute() override; diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 653d6fd51432..a688f306423d 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -353,7 +353,7 @@ public: static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); const PyRef& getWrappedObject() const { return mWrappedObject; } const css::uno::Sequence< css::uno::Type >& getWrappedTypes() const { return mTypes; } - virtual ~Adapter(); + virtual ~Adapter() override; // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > |