Fix -Winconsistent-missing-destructor-override warnings

temeo · temeo · commit 626c0b7b3b7d · 2023-03-30T13:46:14.000+03:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ namespace wsrep`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- ~default_condition_variable()`
	`56`	`+ ~default_condition_variable() WSREP_OVERRIDE`
`57`	`57`	`{`
`58`	`58`	`if (pthread_cond_destroy(&cond_))`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ namespace wsrep`
`58`	`58`	`throw wsrep::runtime_error("mutex init failed");`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`- ~default_mutex()`
	`61`	`+ ~default_mutex() WSREP_OVERRIDE`
`62`	`62`	`{`
`63`	`63`	`if (pthread_mutex_destroy(&mutex_)) ::abort();`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ namespace wsrep`
`69`	`69`	`: value_(value)`
`70`	`70`	`{`
`71`	`71`	`}`
`72`		`- ~option_value_string() {}`
	`72`	`+ ~option_value_string() WSREP_OVERRIDE {}`
`73`	`73`	`const char* as_string() const WSREP_OVERRIDE`
`74`	`74`	`{`
`75`	`75`	`return value_.c_str();`
`@@ -90,7 +90,7 @@ namespace wsrep`
`90`	`90`	`: value_(value)`
`91`	`91`	`{`
`92`	`92`	`}`
`93`		`- ~option_value_bool() {}`
	`93`	`+ ~option_value_bool() WSREP_OVERRIDE {}`
`94`	`94`	`const char* as_string() const WSREP_OVERRIDE`
`95`	`95`	`{`
`96`	`96`	`if (value_)`
`@@ -116,7 +116,7 @@ namespace wsrep`
`116`	`116`	`, value_str_(std::to_string(value))`
`117`	`117`	`{`
`118`	`118`	`}`
`119`		`- ~option_value_int() {}`
	`119`	`+ ~option_value_int() WSREP_OVERRIDE {}`
`120`	`120`	`const char* as_string() const WSREP_OVERRIDE`
`121`	`121`	`{`
`122`	`122`	`return value_str_.c_str();`
`@@ -136,7 +136,7 @@ namespace wsrep`
`136`	`136`	`, value_str_(std::to_string(value))`
`137`	`137`	`{`
`138`	`138`	`}`
`139`		`- ~option_value_double() {}`
	`139`	`+ ~option_value_double() WSREP_OVERRIDE {}`
`140`	`140`	`const char* as_string() const WSREP_OVERRIDE`
`141`	`141`	`{`
`142`	`142`	`return value_str_.c_str();`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ namespace wsrep`
`42`	`42`	`, mutex_()`
`43`	`43`	`, cond_()`
`44`	`44`	`{ }`
`45`		`- ~mock_client_state()`
	`45`	`+ ~mock_client_state() WSREP_OVERRIDE`
`46`	`46`	`{`
`47`	`47`	`if (transaction().active())`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class mock_server_state;`
`30`	`30`	`{`
`31`	`31`	`public:`
`32`	`32`	`mock_storage_service(wsrep::server_state&, wsrep::client_id);`
`33`		`- ~mock_storage_service();`
	`33`	`+ ~mock_storage_service() WSREP_OVERRIDE;`
`34`	`34`
`35`	`35`	`int start_transaction(const wsrep::ws_handle&) WSREP_OVERRIDE;`
`36`	`36`