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 /idl/inc | |
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 'idl/inc')
-rw-r--r-- | idl/inc/hash.hxx | 2 | ||||
-rw-r--r-- | idl/inc/types.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx index c0dd517190ce..a510fbd35a80 100644 --- a/idl/inc/hash.hxx +++ b/idl/inc/hash.hxx @@ -83,7 +83,7 @@ protected: virtual bool equals( const OString &rElement, sal_uInt32 nIndex ) const override; public: SvStringHashTable( sal_uInt32 nMaxEntries ); // max size of hash-tabel - virtual ~SvStringHashTable(); + virtual ~SvStringHashTable() override; OString GetNearString( const OString& rName ) const; virtual bool IsEntry( sal_uInt32 nIndex ) const override; diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 167e902947de..fb051699339a 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -68,7 +68,7 @@ public: SvMetaType(); SvMetaType( const OString& rTypeName ); - virtual ~SvMetaType(); + virtual ~SvMetaType() override; virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; |