From 626c0b7b3b7d7dcdd69de8703b543c651e60354f Mon Sep 17 00:00:00 2001
From: Teemu Ollakka <teemu.ollakka@galeracluster.com>
Date: Thu, 30 Mar 2023 13:28:55 +0300
Subject: [PATCH] Fix -Winconsistent-missing-destructor-override warnings

---
 include/wsrep/condition_variable.hpp | 2 +-
 include/wsrep/mutex.hpp              | 2 +-
 include/wsrep/provider_options.hpp   | 8 ++++----
 src/wsrep_provider_v26.hpp           | 2 +-
 test/mock_client_state.hpp           | 2 +-
 test/mock_high_priority_service.hpp  | 2 +-
 test/mock_storage_service.hpp        | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/wsrep/condition_variable.hpp b/include/wsrep/condition_variable.hpp
index 25a0e16..0912f0e 100644
--- a/include/wsrep/condition_variable.hpp
+++ b/include/wsrep/condition_variable.hpp
@@ -53,7 +53,7 @@ namespace wsrep
             }
         }
 
-        ~default_condition_variable()
+        ~default_condition_variable() WSREP_OVERRIDE
         {
             if (pthread_cond_destroy(&cond_))
             {
diff --git a/include/wsrep/mutex.hpp b/include/wsrep/mutex.hpp
index 9b0173b..1949787 100644
--- a/include/wsrep/mutex.hpp
+++ b/include/wsrep/mutex.hpp
@@ -58,7 +58,7 @@ namespace wsrep
                 throw wsrep::runtime_error("mutex init failed");
             }
         }
-        ~default_mutex()
+        ~default_mutex() WSREP_OVERRIDE
         {
             if (pthread_mutex_destroy(&mutex_)) ::abort();
         }
diff --git a/include/wsrep/provider_options.hpp b/include/wsrep/provider_options.hpp
index bb14500..022e159 100644
--- a/include/wsrep/provider_options.hpp
+++ b/include/wsrep/provider_options.hpp
@@ -69,7 +69,7 @@ namespace wsrep
                 : value_(value)
             {
             }
-            ~option_value_string() {}
+            ~option_value_string() WSREP_OVERRIDE {}
             const char* as_string() const WSREP_OVERRIDE
             {
                 return value_.c_str();
@@ -90,7 +90,7 @@ namespace wsrep
                 : value_(value)
             {
             }
-            ~option_value_bool() {}
+            ~option_value_bool() WSREP_OVERRIDE {}
             const char* as_string() const WSREP_OVERRIDE
             {
                 if (value_)
@@ -116,7 +116,7 @@ namespace wsrep
                 , value_str_(std::to_string(value))
             {
             }
-            ~option_value_int() {}
+            ~option_value_int() WSREP_OVERRIDE {}
             const char* as_string() const WSREP_OVERRIDE
             {
                 return value_str_.c_str();
@@ -136,7 +136,7 @@ namespace wsrep
                 , value_str_(std::to_string(value))
             {
             }
-            ~option_value_double() {}
+            ~option_value_double() WSREP_OVERRIDE {}
             const char* as_string() const WSREP_OVERRIDE
             {
                 return value_str_.c_str();
diff --git a/src/wsrep_provider_v26.hpp b/src/wsrep_provider_v26.hpp
index 1859b67..608b7c9 100644
--- a/src/wsrep_provider_v26.hpp
+++ b/src/wsrep_provider_v26.hpp
@@ -35,7 +35,7 @@ namespace wsrep
         wsrep_provider_v26(wsrep::server_state&, const std::string&,
                            const std::string&,
                            const wsrep::provider::services& services);
-        ~wsrep_provider_v26();
+        ~wsrep_provider_v26() WSREP_OVERRIDE;
         enum wsrep::provider::status
         connect(const std::string&, const std::string&, const std::string&,
                     bool) WSREP_OVERRIDE;
diff --git a/test/mock_client_state.hpp b/test/mock_client_state.hpp
index fa71fbc..73b2775 100644
--- a/test/mock_client_state.hpp
+++ b/test/mock_client_state.hpp
@@ -42,7 +42,7 @@ namespace wsrep
             , mutex_()
             , cond_()
         { }
-        ~mock_client_state()
+        ~mock_client_state() WSREP_OVERRIDE
         {
             if (transaction().active())
             {
diff --git a/test/mock_high_priority_service.hpp b/test/mock_high_priority_service.hpp
index caf40b2..615ba9d 100644
--- a/test/mock_high_priority_service.hpp
+++ b/test/mock_high_priority_service.hpp
@@ -43,7 +43,7 @@ namespace wsrep
             , nbo_cs_()
         { }
 
-        ~mock_high_priority_service()
+        ~mock_high_priority_service() WSREP_OVERRIDE
         { }
         int start_transaction(const wsrep::ws_handle&, const wsrep::ws_meta&)
             WSREP_OVERRIDE;
diff --git a/test/mock_storage_service.hpp b/test/mock_storage_service.hpp
index b0275b9..18d2b98 100644
--- a/test/mock_storage_service.hpp
+++ b/test/mock_storage_service.hpp
@@ -30,7 +30,7 @@ class mock_server_state;
     {
     public:
         mock_storage_service(wsrep::server_state&, wsrep::client_id);
-        ~mock_storage_service();
+        ~mock_storage_service() WSREP_OVERRIDE;
 
         int start_transaction(const wsrep::ws_handle&) WSREP_OVERRIDE;