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/comphelper/enumhelper.hxx | |
| 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 'include/comphelper/enumhelper.hxx')
| -rw-r--r-- | include/comphelper/enumhelper.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx index e6d115eac9a5..6e116af61cb5 100644 --- a/include/comphelper/enumhelper.hxx +++ b/include/comphelper/enumhelper.hxx @@ -54,7 +54,7 @@ public: OEnumerationByName(const css::uno::Reference< css::container::XNameAccess >& _rxAccess); OEnumerationByName(const css::uno::Reference< css::container::XNameAccess >& _rxAccess, const css::uno::Sequence< OUString >& _aNames ); - virtual ~OEnumerationByName(); + virtual ~OEnumerationByName() override; virtual sal_Bool SAL_CALL hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL nextElement( ) @@ -80,7 +80,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByIndex : private OEnumerationLock public: OEnumerationByIndex(const css::uno::Reference< css::container::XIndexAccess >& _rxAccess); - virtual ~OEnumerationByIndex(); + virtual ~OEnumerationByIndex() override; virtual sal_Bool SAL_CALL hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL nextElement( ) @@ -109,7 +109,7 @@ class COMPHELPER_DLLPUBLIC OAnyEnumeration : private OEnumerationLock public: OAnyEnumeration(const css::uno::Sequence< css::uno::Any >& lItems); - virtual ~OAnyEnumeration(); + virtual ~OAnyEnumeration() override; virtual sal_Bool SAL_CALL hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL nextElement( ) |