From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
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
---
 sccomp/source/solver/CoinMPSolver.cxx    | 2 +-
 sccomp/source/solver/LpsolveSolver.cxx   | 2 +-
 sccomp/source/solver/SolverComponent.hxx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'sccomp')

diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx
index 0fad6ca63ceb..348bcf75f721 100644
--- a/sccomp/source/solver/CoinMPSolver.cxx
+++ b/sccomp/source/solver/CoinMPSolver.cxx
@@ -37,7 +37,7 @@ class CoinMPSolver : public SolverComponent
 {
 public:
     CoinMPSolver() {}
-    virtual ~CoinMPSolver() {}
+    virtual ~CoinMPSolver() override {}
 
 private:
     virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) override;
diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx
index 1652cb11c9ec..b07691eae3a4 100644
--- a/sccomp/source/solver/LpsolveSolver.cxx
+++ b/sccomp/source/solver/LpsolveSolver.cxx
@@ -68,7 +68,7 @@ class LpsolveSolver : public SolverComponent
 {
 public:
     LpsolveSolver() {}
-    virtual ~LpsolveSolver() {}
+    virtual ~LpsolveSolver() override {}
 
 private:
     virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) override;
diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx
index 7f9ba1bb94a4..dd0d21affd3b 100644
--- a/sccomp/source/solver/SolverComponent.hxx
+++ b/sccomp/source/solver/SolverComponent.hxx
@@ -99,7 +99,7 @@ protected:
 
 public:
                             SolverComponent();
-    virtual                 ~SolverComponent();
+    virtual                 ~SolverComponent() override;
 
     DECLARE_XINTERFACE()
     DECLARE_XTYPEPROVIDER()
-- 
cgit v1.2.3