From 73bf30ae047268403a772e194e9c6d3f53d787ed Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Wed, 17 Jun 2020 01:06:40 +0300
Subject: [PATCH] Enable -Wsuggest-override in warnings_test; add
 BOOST_OVERRIDE appropriately

---
 .../boost/system/detail/std_interoperability.hpp   | 10 +++++-----
 include/boost/system/error_code.hpp                | 14 +++++++-------
 test/warnings_test.cpp                             |  4 ++++
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/include/boost/system/detail/std_interoperability.hpp b/include/boost/system/detail/std_interoperability.hpp
index 30a378f..66ebecb 100644
--- a/include/boost/system/detail/std_interoperability.hpp
+++ b/include/boost/system/detail/std_interoperability.hpp
@@ -47,23 +47,23 @@ public:
         }
     }
 
-    virtual const char * name() const BOOST_NOEXCEPT
+    const char * name() const BOOST_NOEXCEPT BOOST_OVERRIDE
     {
         return pc_->name();
     }
 
-    virtual std::string message( int ev ) const
+    std::string message( int ev ) const BOOST_OVERRIDE
     {
         return pc_->message( ev );
     }
 
-    virtual std::error_condition default_error_condition( int ev ) const BOOST_NOEXCEPT
+    std::error_condition default_error_condition( int ev ) const BOOST_NOEXCEPT BOOST_OVERRIDE
     {
         return pc_->default_error_condition( ev );
     }
 
-    virtual bool equivalent( int code, const std::error_condition & condition ) const BOOST_NOEXCEPT;
-    virtual bool equivalent( const std::error_code & code, int condition ) const BOOST_NOEXCEPT;
+    bool equivalent( int code, const std::error_condition & condition ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
+    bool equivalent( const std::error_code & code, int condition ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
 };
 
 #if !defined(__SUNPRO_CC) // trailing __global is not supported
diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp
index 70433ac..ed8584e 100644
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -287,13 +287,13 @@ public:
     {
     }
 
-    const char * name() const BOOST_NOEXCEPT
+    const char * name() const BOOST_NOEXCEPT BOOST_OVERRIDE
     {
         return "generic";
     }
 
-    std::string message( int ev ) const;
-    char const * message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT;
+    std::string message( int ev ) const BOOST_OVERRIDE;
+    char const * message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
 };
 
 class BOOST_SYMBOL_VISIBLE system_error_category: public error_category
@@ -305,15 +305,15 @@ public:
     {
     }
 
-    const char * name() const BOOST_NOEXCEPT
+    const char * name() const BOOST_NOEXCEPT BOOST_OVERRIDE
     {
         return "system";
     }
 
-    error_condition default_error_condition( int ev ) const BOOST_NOEXCEPT;
+    error_condition default_error_condition( int ev ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
 
-    std::string message( int ev ) const;
-    char const * message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT;
+    std::string message( int ev ) const BOOST_OVERRIDE;
+    char const * message( int ev, char * buffer, std::size_t len ) const BOOST_NOEXCEPT BOOST_OVERRIDE;
 };
 
 } // namespace detail
diff --git a/test/warnings_test.cpp b/test/warnings_test.cpp
index f7554e1..39c6f7a 100644
--- a/test/warnings_test.cpp
+++ b/test/warnings_test.cpp
@@ -8,6 +8,10 @@
 
 // See library home page at http://www.boost.org/libs/system
 
+#if defined(__GNUC__) && __GNUC__ >= 5 && __cplusplus >= 201103L
+# pragma GCC diagnostic error "-Wsuggest-override"
+#endif
+
 #include <boost/config.hpp>
 
 #if defined( BOOST_GCC ) && BOOST_GCC < 40600