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 /testtools | |
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 'testtools')
-rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 4 | ||||
-rw-r--r-- | testtools/source/bridgetest/constructors.cxx | 4 | ||||
-rw-r--r-- | testtools/source/bridgetest/cppobj.cxx | 2 | ||||
-rw-r--r-- | testtools/source/bridgetest/currentcontextchecker.cxx | 2 | ||||
-rw-r--r-- | testtools/source/bridgetest/currentcontextchecker.hxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 70ff2170442c..bcccf4f4d20a 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -111,7 +111,7 @@ public: explicit TestBridgeImpl( const Reference< XComponentContext > & xContext ) : m_xContext( xContext ) {} - virtual ~TestBridgeImpl() + virtual ~TestBridgeImpl() override { } @@ -339,7 +339,7 @@ class MyClass : public osl::DebugBase<MyClass>, public OWeakObject { public: MyClass(); - virtual ~MyClass(); + virtual ~MyClass() override; }; diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 7653b8ab2625..7f1a760d50af 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -57,7 +57,7 @@ public: Impl& operator=(const Impl&) = delete; private: - virtual ~Impl() {} + virtual ~Impl() override {} virtual void SAL_CALL initialize( css::uno::Sequence< css::uno::Any > const & arguments) @@ -190,7 +190,7 @@ public: Impl2(): m_attr1(0.0) {} private: - virtual ~Impl2() {} + virtual ~Impl2() override {} virtual void SAL_CALL initialize( css::uno::Sequence< css::uno::Any > const & arguments) diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 8101f1efe11b..9dcd2392bfcc 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -151,7 +151,7 @@ public: m_bFirstCall( true ), m_bSequenceOfCallTestPassed( true ) {} - virtual ~Test_Impl() + virtual ~Test_Impl() override { OSL_TRACE( "> scalar Test_Impl dtor <" ); } diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx index e28316351ac5..114af51a4c22 100644 --- a/testtools/source/bridgetest/currentcontextchecker.cxx +++ b/testtools/source/bridgetest/currentcontextchecker.cxx @@ -48,7 +48,7 @@ class CurrentContext: public: CurrentContext(); - virtual ~CurrentContext(); + virtual ~CurrentContext() override; CurrentContext(const CurrentContext&) = delete; CurrentContext& operator=(const CurrentContext&) = delete; diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx b/testtools/source/bridgetest/currentcontextchecker.hxx index 9c4a72a9e7c6..711a8ef5e716 100644 --- a/testtools/source/bridgetest/currentcontextchecker.hxx +++ b/testtools/source/bridgetest/currentcontextchecker.hxx @@ -38,7 +38,7 @@ class SAL_DLLPRIVATE CurrentContextChecker : public: CurrentContextChecker(); - virtual ~CurrentContextChecker(); + virtual ~CurrentContextChecker() override; virtual sal_Bool SAL_CALL perform( css::uno::Reference< ::test::testtools::bridgetest::XCurrentContextChecker > const & other, |