From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Sep 2016 13:09:01 +0200 Subject: 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 --- binaryurp/source/bridge.hxx | 2 +- binaryurp/source/bridgefactory.hxx | 2 +- binaryurp/source/reader.hxx | 2 +- binaryurp/source/writer.hxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'binaryurp') diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx index 7c148756704d..517b69b81552 100644 --- a/binaryurp/source/bridge.hxx +++ b/binaryurp/source/bridge.hxx @@ -172,7 +172,7 @@ private: Bridge(const Bridge&) = delete; Bridge& operator=(const Bridge&) = delete; - virtual ~Bridge(); + virtual ~Bridge() override; virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getInstance(OUString const & sInstanceName) diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx index ad96b85417eb..f1cc4bb88460 100644 --- a/binaryurp/source/bridgefactory.hxx +++ b/binaryurp/source/bridgefactory.hxx @@ -82,7 +82,7 @@ private: com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context); - virtual ~BridgeFactory(); + virtual ~BridgeFactory() override; virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) override; diff --git a/binaryurp/source/reader.hxx b/binaryurp/source/reader.hxx index 8dd4822a6cad..c4a7355ed7dd 100644 --- a/binaryurp/source/reader.hxx +++ b/binaryurp/source/reader.hxx @@ -43,7 +43,7 @@ public: explicit Reader(rtl::Reference< Bridge > const & bridge); private: - virtual ~Reader(); + virtual ~Reader() override; virtual void execute() override; diff --git a/binaryurp/source/writer.hxx b/binaryurp/source/writer.hxx index bd08181d8860..d5f7e3d3a36a 100644 --- a/binaryurp/source/writer.hxx +++ b/binaryurp/source/writer.hxx @@ -81,7 +81,7 @@ public: void stop(); private: - virtual ~Writer(); + virtual ~Writer() override; virtual void execute() override; -- cgit v1.2.3