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 /cppuhelper/source/servicemanager.cxx | |
| 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 'cppuhelper/source/servicemanager.cxx')
| -rw-r--r-- | cppuhelper/source/servicemanager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index 75894244e96e..a4267f9d8442 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -449,7 +449,7 @@ public: const ContentEnumeration& operator=(const ContentEnumeration&) = delete; private: - virtual ~ContentEnumeration() {} + virtual ~ContentEnumeration() override {} virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override; @@ -508,7 +508,7 @@ public: const SingletonFactory& operator=(const SingletonFactory&) = delete; private: - virtual ~SingletonFactory() {} + virtual ~SingletonFactory() override {} virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( @@ -564,7 +564,7 @@ public: const ImplementationWrapper& operator=(const ImplementationWrapper&) = delete; private: - virtual ~ImplementationWrapper() {} + virtual ~ImplementationWrapper() override {} virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( |