summaryrefslogtreecommitdiff
path: root/include/vcl/lazydelete.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /include/vcl/lazydelete.hxx
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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/vcl/lazydelete.hxx')
-rw-r--r--include/vcl/lazydelete.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 4f28b3254ef9..ca21f5c0ad08 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -118,7 +118,7 @@ namespace vcl
static bool is_less( vcl::Window* left, vcl::Window* right );
LazyDeletor() { LazyDelete::addDeletor( this ); }
- virtual ~LazyDeletor()
+ virtual ~LazyDeletor() override
{
SAL_INFO("vcl.lazydelete", typeid(*this).name() << std::hex << this << " deleted");
if( s_pOneInstance == this ) // sanity check
@@ -227,7 +227,7 @@ namespace vcl
virtual void doCleanup() override { delete m_pT; m_pT = nullptr; }
public:
DeleteOnDeinit( T* i_pT ) : m_pT( i_pT ) { addDeinitContainer( this ); }
- virtual ~DeleteOnDeinit() {}
+ virtual ~DeleteOnDeinit() override {}
// get contents
T* get() { return m_pT; }
@@ -261,7 +261,7 @@ namespace vcl
public:
DeleteUnoReferenceOnDeinit(const css::uno::Reference<I>& r_xI ) : m_xI( r_xI ) {
addDeinitContainer( this ); }
- virtual ~DeleteUnoReferenceOnDeinit() {}
+ virtual ~DeleteUnoReferenceOnDeinit() override {}
css::uno::Reference<I> get() { return m_xI; }