refactor: use BOOST_STATIC_ASSERT

e-kwsm · e-kwsm · commit 54ddf1cf4a8b · 2025-01-18T06:14:49.000+09:00
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)

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`# include <boost/python/handle.hpp>`
`11`	`11`	`# include <boost/config.hpp>`
	`12`	`+# include <boost/static_assert.hpp>`
`12`	`13`	`# include <cstddef>`
`13`	`14`	`# include <utility>`
`14`	`15`
`@@ -42,7 +43,7 @@ namespace detail`
`42`	`43`	`template <int keywords, int function_args>`
`43`	`44`	`struct more_keywords_than_function_arguments`
`44`	`45`	`{`
`45`		`- typedef char too_many_keywords[keywords > function_args ? -1 : 1];`
	`46`	`+ BOOST_STATIC_ASSERT(keywords <= function_args);`
`46`	`47`	`};`
`47`	`48`	`}`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`#include <boost/mpl/prior.hpp>`
`27`	`27`	`#include <boost/mpl/joint_view.hpp>`
`28`	`28`	`#include <boost/mpl/back.hpp>`
	`29`	`+#include <boost/static_assert.hpp>`
`29`	`30`
`30`	`31`	`#include <boost/python/detail/type_traits.hpp>`
`31`	`32`
`@@ -68,7 +69,7 @@ namespace detail`
`68`	`69`	`template <int keywords, int init_args>`
`69`	`70`	`struct more_keywords_than_init_arguments`
`70`	`71`	`{`
`71`		`- typedef char too_many_keywords[init_args - keywords >= 0 ? 1 : -1] BOOST_ATTRIBUTE_UNUSED;`
	`72`	`+ BOOST_STATIC_ASSERT(keywords <= init_args);`
`72`	`73`	`};`
`73`	`74`	`}`
`74`	`75`
`@@ -222,18 +223,14 @@ class init : public init_base<init<BOOST_PYTHON_OVERLOAD_ARGS> >`
`222`	`223`	`init(char const* doc_, detail::keywords<N> const& kw)`
`223`	`224`	`: base(doc_, kw.range())`
`224`	`225`	`{`
`225`		`- typedef typename detail::error::more_keywords_than_init_arguments<`
`226`		`- N, n_arguments::value + 1`
`227`		`- >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;`
	`226`	`+ BOOST_STATIC_ASSERT(N <= n_arguments::value + 1);`
`228`	`227`	`}`
`229`	`228`
`230`	`229`	`template <std::size_t N>`
`231`	`230`	`init(detail::keywords<N> const& kw, char const* doc_ = 0)`
`232`	`231`	`: base(doc_, kw.range())`
`233`	`232`	`{`
`234`		`- typedef typename detail::error::more_keywords_than_init_arguments<`
`235`		`- N, n_arguments::value + 1`
`236`		`- >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;`
	`233`	`+ BOOST_STATIC_ASSERT(N <= n_arguments::value + 1);`
`237`	`234`	`}`
`238`	`235`
`239`	`236`	`template <class CallPoliciesT>`