summaryrefslogtreecommitdiff
path: root/include/cppuhelper/compbase_ex.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/cppuhelper/compbase_ex.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/cppuhelper/compbase_ex.hxx')
-rw-r--r--include/cppuhelper/compbase_ex.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx
index 7c4179f96da2..611d0a10541f 100644
--- a/include/cppuhelper/compbase_ex.hxx
+++ b/include/cppuhelper/compbase_ex.hxx
@@ -55,7 +55,7 @@ protected:
public:
/** Destructor
*/
- virtual ~WeakComponentImplHelperBase();
+ virtual ~WeakComponentImplHelperBase() SAL_OVERRIDE;
// these are here to force memory de/allocation to sal lib.
inline static void * SAL_CALL operator new( size_t nSize )
@@ -100,7 +100,7 @@ protected:
WeakAggComponentImplHelperBase( ::osl::Mutex & rMutex );
public:
- virtual ~WeakAggComponentImplHelperBase();
+ virtual ~WeakAggComponentImplHelperBase() SAL_OVERRIDE;
// these are here to force memory de/allocation to sal lib.
inline static void * SAL_CALL operator new( size_t nSize )