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 /comphelper/source/property | |
| 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 'comphelper/source/property')
| -rw-r--r-- | comphelper/source/property/genericpropertyset.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/property/opropertybag.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 64bdf1ab190a..e8b08eca2497 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -63,7 +63,7 @@ namespace comphelper public: explicit GenericPropertySet( PropertySetInfo* pInfo ) throw(); - virtual ~GenericPropertySet() throw(); + virtual ~GenericPropertySet() throw() override; // XInterface virtual Any SAL_CALL queryAggregation( const Type & rType ) throw( RuntimeException, std::exception) override; diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 467aee20c718..ca2df4a9fa0a 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -92,7 +92,7 @@ namespace comphelper OPropertyBag(const OPropertyBag&) = delete; const OPropertyBag& operator=(const OPropertyBag&) = delete; OPropertyBag(); - virtual ~OPropertyBag(); + virtual ~OPropertyBag() override; protected: DECLARE_XINTERFACE() |