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
---
 cppu/source/AffineBridge/AffineBridge.cxx                 | 2 +-
 cppu/source/LogBridge/LogBridge.cxx                       | 2 +-
 cppu/source/UnsafeBridge/UnsafeBridge.cxx                 | 2 +-
 cppu/source/helper/purpenv/helper_purpenv_Environment.cxx | 2 +-
 cppu/source/threadpool/thread.hxx                         | 2 +-
 cppu/source/threadpool/threadpool.hxx                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'cppu/source')

diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 75d406f0e7f7..6d194517bf56 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -69,7 +69,7 @@ public:
     OuterThread         * m_pOuterThread;
 
     explicit  AffineBridge();
-    virtual  ~AffineBridge();
+    virtual  ~AffineBridge() override;
 
     virtual void  v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) override;
     virtual void  v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) override;
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index e791e7a5be94..604369d85186 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -40,7 +40,7 @@ class LogBridge : public cppu::Enterable
     sal_Int32           m_count;
     oslThreadIdentifier m_threadId;
 
-    virtual  ~LogBridge();
+    virtual  ~LogBridge() override;
 
 public:
     explicit LogBridge();
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 85690841bccc..1187f54dbe58 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -48,7 +48,7 @@ class UnsafeBridge : public cppu::Enterable
     sal_Int32           m_count;
     oslThreadIdentifier m_threadId;
 
-    virtual  ~UnsafeBridge();
+    virtual  ~UnsafeBridge() override;
 
 public:
     explicit UnsafeBridge();
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index 1e316c7f2550..449429ffc0b0 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -126,7 +126,7 @@ protected:
     ExtEnv_acquireInterface        * m_env_acquireInterface;
     ExtEnv_releaseInterface        * m_env_releaseInterface;
 
-    virtual  ~Base();
+    virtual  ~Base() override;
 };
 
 extern "C" {
diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx
index fa67a082bd94..1e74f025159b 100644
--- a/cppu/source/threadpool/thread.hxx
+++ b/cppu/source/threadpool/thread.hxx
@@ -41,7 +41,7 @@ namespace cppu_threadpool {
                         JobQueue * ,
                         const ::rtl::ByteSequence &aThreadId,
                         bool bAsynchron );
-        virtual ~ORequestThread();
+        virtual ~ORequestThread() override;
 
         void setTask( JobQueue * , const ::rtl::ByteSequence & aThreadId , bool bAsynchron );
 
diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx
index b5587d46be44..d5cb8df7be3c 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -118,7 +118,7 @@ namespace cppu_threadpool {
     {
     public:
         ThreadPool();
-        virtual ~ThreadPool();
+        virtual ~ThreadPool() override;
 
         void dispose( sal_Int64 nDisposeId );
         void destroy( sal_Int64 nDisposeId );
-- 
cgit