refactor: use BOOST_STATIC_ASSERT

boostorg · Jan 17, 2025 · 54ddf1c · 54ddf1c
1 parent 4fc3afa
commit 54ddf1c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 20 deletions.
diff --git a/include/boost/python/args_fwd.hpp b/include/boost/python/args_fwd.hpp
@@ -9,6 +9,7 @@
 
 # include <boost/python/handle.hpp>
 # include <boost/config.hpp>
+# include <boost/static_assert.hpp>
 # include <cstddef>
 # include <utility>
 
@@ -42,7 +43,7 @@ namespace detail
     template <int keywords, int function_args>
     struct more_keywords_than_function_arguments
     {
-        typedef char too_many_keywords[keywords > function_args ? -1 : 1];
+        BOOST_STATIC_ASSERT(keywords <= function_args);
     };
   }
 }

diff --git a/include/boost/python/detail/defaults_gen.hpp b/include/boost/python/detail/defaults_gen.hpp
@@ -26,6 +26,7 @@
 #include <boost/mpl/begin_end.hpp>
 #include <boost/mpl/next.hpp>
 #include <boost/mpl/deref.hpp>
+#include <boost/static_assert.hpp>
 #include <cstddef>
 
 namespace boost { namespace python {
@@ -211,18 +212,14 @@ namespace detail
         : ::boost::python::detail::overloads_common<fstubs_name>(                           \
             doc, keywords.range())                                                          \
     {                                                                                       \
-        typedef typename ::boost::python::detail::                                          \
-            error::more_keywords_than_function_arguments<                                   \
-                N,n_args>::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;              \
+        BOOST_STATIC_ASSERT(N <= n_args);                                                   \
     }                                                                                       \
     template <std::size_t N>                                                                \
     fstubs_name(::boost::python::detail::keywords<N> const& keywords, char const* doc = 0)  \
         : ::boost::python::detail::overloads_common<fstubs_name>(                           \
             doc, keywords.range())                                                          \
     {                                                                                       \
-        typedef typename ::boost::python::detail::                                          \
-            error::more_keywords_than_function_arguments<                                   \
-                N,n_args>::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;              \
+        BOOST_STATIC_ASSERT(N <= n_args);                                                   \
     }
 
 # if defined(BOOST_NO_VOID_RETURNS)

diff --git a/include/boost/python/init.hpp b/include/boost/python/init.hpp
@@ -26,6 +26,7 @@
 #include <boost/mpl/prior.hpp>
 #include <boost/mpl/joint_view.hpp>
 #include <boost/mpl/back.hpp>
+#include <boost/static_assert.hpp>
 
 #include <boost/python/detail/type_traits.hpp>
 
@@ -68,7 +69,7 @@ namespace detail
     template <int keywords, int init_args>
     struct more_keywords_than_init_arguments
     {
-        typedef char too_many_keywords[init_args - keywords >= 0 ? 1 : -1] BOOST_ATTRIBUTE_UNUSED;
+        BOOST_STATIC_ASSERT(keywords <= init_args);
     };
   }
 
@@ -222,18 +223,14 @@ class init : public init_base<init<BOOST_PYTHON_OVERLOAD_ARGS> >
     init(char const* doc_, detail::keywords<N> const& kw)
         : base(doc_, kw.range())
     {
-        typedef typename detail::error::more_keywords_than_init_arguments<
-            N, n_arguments::value + 1
-            >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;
+        BOOST_STATIC_ASSERT(N <= n_arguments::value + 1);
     }
 
     template <std::size_t N>
     init(detail::keywords<N> const& kw, char const* doc_ = 0)
         : base(doc_, kw.range())
     {
-        typedef typename detail::error::more_keywords_than_init_arguments<
-            N, n_arguments::value + 1
-            >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;
+        BOOST_STATIC_ASSERT(N <= n_arguments::value + 1);
     }
 
     template <class CallPoliciesT>

diff --git a/include/boost/python/make_constructor.hpp b/include/boost/python/make_constructor.hpp
@@ -24,6 +24,7 @@
 # include <boost/mpl/push_front.hpp>
 # include <boost/mpl/pop_front.hpp>
 # include <boost/mpl/assert.hpp>
+# include <boost/static_assert.hpp>
 
 namespace boost { namespace python {
 
@@ -182,9 +183,7 @@ namespace detail
   {
       enum { arity = mpl::size<Sig>::value - 1 };
 
-      typedef typename detail::error::more_keywords_than_function_arguments<
-          NumKeywords::value, arity
-          >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;
+      BOOST_STATIC_ASSERT(NumKeywords::value <= arity);
 
       typedef typename outer_constructor_signature<Sig>::type outer_signature;
 

diff --git a/include/boost/python/make_function.hpp b/include/boost/python/make_function.hpp
@@ -15,6 +15,7 @@
 
 # include <boost/mpl/size.hpp>
 # include <boost/mpl/int.hpp>
+# include <boost/static_assert.hpp>
 
 namespace boost { namespace python {
 
@@ -53,9 +54,7 @@ namespace detail
   {
       enum { arity = mpl::size<Sig>::value - 1 };
 
-      typedef typename detail::error::more_keywords_than_function_arguments<
-          NumKeywords::value, arity
-          >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;
+      BOOST_STATIC_ASSERT(NumKeywords::value <= arity);
 
       return objects::function_object(
           detail::caller<F,CallPolicies,Sig>(f, p)