From 7e0113bae22b9877b20d2c9ce8aebdf5e91afdff Mon Sep 17 00:00:00 2001
From: Eugene Zelenko <eugene@diakopto.com>
Date: Mon, 27 Apr 2020 09:44:05 -0700
Subject: [PATCH] Use BOOST_OVERRIDE to fix GCC -Wsuggest-override and
 Clang-tidy modernize-use-override warnings.

---
 .../boost/python/object/pointer_holder.hpp    |  4 ++--
 include/boost/python/object/py_function.hpp   | 20 +++++++++----------
 include/boost/python/object/value_holder.hpp  |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/boost/python/object/pointer_holder.hpp b/include/boost/python/object/pointer_holder.hpp
index c3b57e83..a714f4ca 100644
--- a/include/boost/python/object/pointer_holder.hpp
+++ b/include/boost/python/object/pointer_holder.hpp
@@ -62,7 +62,7 @@ struct pointer_holder : instance_holder
  private: // types
     
  private: // required holder implementation
-    void* holds(type_info, bool null_ptr_only);
+    void* holds(type_info, bool null_ptr_only) BOOST_OVERRIDE;
     
     template <class T>
     inline void* holds_wrapped(type_info dst_t, wrapper<T>*,T* p)
@@ -96,7 +96,7 @@ struct pointer_holder_back_reference : instance_holder
 #  include BOOST_PP_ITERATE()
 
  private: // required holder implementation
-    void* holds(type_info, bool null_ptr_only);
+    void* holds(type_info, bool null_ptr_only) BOOST_OVERRIDE;
 
  private: // data members
     Pointer m_p;
diff --git a/include/boost/python/object/py_function.hpp b/include/boost/python/object/py_function.hpp
index df2fb44a..d2bca241 100644
--- a/include/boost/python/object/py_function.hpp
+++ b/include/boost/python/object/py_function.hpp
@@ -33,17 +33,17 @@ struct caller_py_function_impl : py_function_impl_base
         : m_caller(caller)
     {}
     
-    PyObject* operator()(PyObject* args, PyObject* kw)
+    PyObject* operator()(PyObject* args, PyObject* kw) BOOST_OVERRIDE
     {
         return m_caller(args, kw);
     }
     
-    virtual unsigned min_arity() const
+    unsigned min_arity() const BOOST_OVERRIDE
     {
         return m_caller.min_arity();
     }
     
-    virtual python::detail::py_func_sig_info signature() const
+    python::detail::py_func_sig_info signature() const BOOST_OVERRIDE
     {
         return m_caller.signature();
     }
@@ -59,17 +59,17 @@ struct signature_py_function_impl : py_function_impl_base
         : m_caller(caller)
     {}
     
-    PyObject* operator()(PyObject* args, PyObject* kw)
+    PyObject* operator()(PyObject* args, PyObject* kw) BOOST_OVERRIDE
     {
         return m_caller(args, kw);
     }
     
-    virtual unsigned min_arity() const
+    unsigned min_arity() const BOOST_OVERRIDE
     {
         return mpl::size<Sig>::value - 1;
     }
     
-    virtual python::detail::py_func_sig_info signature() const
+    python::detail::py_func_sig_info signature() const BOOST_OVERRIDE
     {
         python::detail::signature_element const* sig = python::detail::signature<Sig>::elements();
         python::detail::py_func_sig_info res = {sig, sig};
@@ -89,22 +89,22 @@ struct full_py_function_impl : py_function_impl_base
       , m_max_arity(max_arity > min_arity ? max_arity : min_arity)
     {}
     
-    PyObject* operator()(PyObject* args, PyObject* kw)
+    PyObject* operator()(PyObject* args, PyObject* kw) BOOST_OVERRIDE
     {
         return m_caller(args, kw);
     }
     
-    virtual unsigned min_arity() const
+    unsigned min_arity() const BOOST_OVERRIDE
     {
         return m_min_arity;
     }
     
-    virtual unsigned max_arity() const
+    unsigned max_arity() const BOOST_OVERRIDE
     {
         return m_max_arity;
     }
     
-    virtual python::detail::py_func_sig_info signature() const
+    python::detail::py_func_sig_info signature() const BOOST_OVERRIDE
     {
         python::detail::signature_element const* sig = python::detail::signature<Sig>::elements();
         python::detail::py_func_sig_info res = {sig, sig};
diff --git a/include/boost/python/object/value_holder.hpp b/include/boost/python/object/value_holder.hpp
index a4e91786..fc457bda 100644
--- a/include/boost/python/object/value_holder.hpp
+++ b/include/boost/python/object/value_holder.hpp
@@ -46,7 +46,7 @@ struct value_holder : instance_holder
 #  include BOOST_PP_ITERATE()
 
  private: // required holder implementation
-    void* holds(type_info, bool null_ptr_only);
+    void* holds(type_info, bool null_ptr_only) BOOST_OVERRIDE;
     
     template <class T>
     inline void* holds_wrapped(type_info dst_t, wrapper<T>*,T* p)
@@ -73,7 +73,7 @@ struct value_holder_back_reference : instance_holder
 #  include BOOST_PP_ITERATE()
 
 private: // required holder implementation
-    void* holds(type_info, bool null_ptr_only);
+    void* holds(type_info, bool null_ptr_only) BOOST_OVERRIDE;
 
  private: // data members
     Held m_held;
-- 
2.17.1