Suppress more unused typedef warnings.

stefanseefeld · stefanseefeld · commit 2e8cd3d8f216 · 2016-06-24T17:22:17.000-04:00
diff --git a/include/boost/python/class.hpp b/include/boost/python/class.hpp
@@ -140,9 +140,9 @@ namespace detail
             // https://svn.boost.org/trac/boost/ticket/5803
             //typedef typename assertion<mpl::not_<is_same<Default,Fn> > >::failed test0;
 # if !BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
-            typedef typename assertion<is_polymorphic<T> >::failed test1;
+            typedef typename assertion<is_polymorphic<T> >::failed test1 BOOST_ATTRIBUTE_UNUSED;
 # endif 
-            typedef typename assertion<is_member_function_pointer<Fn> >::failed test2;
+            typedef typename assertion<is_member_function_pointer<Fn> >::failed test2 BOOST_ATTRIBUTE_UNUSED;
             not_a_derived_class_member<Default>(Fn());
         }
     };
diff --git a/include/boost/python/def.hpp b/include/boost/python/def.hpp
@@ -37,7 +37,7 @@ namespace detail
       // Must not try to use default implementations except with method definitions.
       typedef typename error::multiple_functions_passed_to_def<
           Helper::has_default_implementation
-          >::type assertion;
+          >::type assertion BOOST_ATTRIBUTE_UNUSED;
       
       detail::scope_setattr_doc(
           name, boost::python::make_function(
diff --git a/include/boost/python/detail/config.hpp b/include/boost/python/detail/config.hpp
@@ -135,4 +135,8 @@
 #define BOOST_PYTHON_SUPPORTS_PY_SIGNATURES // enables smooth transition
 #endif
 
+#if !defined(BOOST_ATTRIBUTE_UNUSED) && defined(__GNUC__) && (__GNUC__ >= 4)
+#  define BOOST_ATTRIBUTE_UNUSED __attribute__((unused))
+#endif
+
 #endif // CONFIG_DWA052200_H_
diff --git a/include/boost/python/detail/defaults_gen.hpp b/include/boost/python/detail/defaults_gen.hpp
@@ -213,7 +213,7 @@ namespace detail
     {                                                                                       \
         typedef typename ::boost::python::detail::                                          \
             error::more_keywords_than_function_arguments<                                   \
-                N,n_args>::too_many_keywords assertion;                                     \
+                N,n_args>::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;              \
     }                                                                                       \
     template <std::size_t N>                                                                \
     fstubs_name(::boost::python::detail::keywords<N> const& keywords, char const* doc = 0)  \
@@ -222,7 +222,7 @@ namespace detail
     {                                                                                       \
         typedef typename ::boost::python::detail::                                          \
             error::more_keywords_than_function_arguments<                                   \
-                N,n_args>::too_many_keywords assertion;                                     \
+                N,n_args>::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;              \
     }
 
 # if defined(BOOST_NO_VOID_RETURNS)
diff --git a/include/boost/python/init.hpp b/include/boost/python/init.hpp
@@ -68,7 +68,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];
+        typedef char too_many_keywords[init_args - keywords >= 0 ? 1 : -1] BOOST_ATTRIBUTE_UNUSED;
     };
   }
 
@@ -224,7 +224,7 @@ class init : public init_base<init<BOOST_PYTHON_OVERLOAD_ARGS> >
     {
         typedef typename detail::error::more_keywords_than_init_arguments<
             N, n_arguments::value + 1
-            >::too_many_keywords assertion;
+            >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;
     }
 
     template <std::size_t N>
@@ -233,7 +233,7 @@ class init : public init_base<init<BOOST_PYTHON_OVERLOAD_ARGS> >
     {
         typedef typename detail::error::more_keywords_than_init_arguments<
             N, n_arguments::value + 1
-            >::too_many_keywords assertion;
+            >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;
     }
 
     template <class CallPoliciesT>
diff --git a/include/boost/python/make_constructor.hpp b/include/boost/python/make_constructor.hpp
@@ -174,7 +174,7 @@ namespace detail
       
       typedef typename detail::error::more_keywords_than_function_arguments<
           NumKeywords::value, arity
-          >::too_many_keywords assertion;
+          >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;
     
       typedef typename outer_constructor_signature<Sig>::type outer_signature;
 
diff --git a/test/destroy_test.cpp b/test/destroy_test.cpp
@@ -38,7 +38,6 @@ void assert_destructions(int n)
 int main()
 {
     assert_destructions(0);
-    typedef int a[2];
     
     foo* f1 = new foo;
     boost::python::detail::destroy_referent<foo const volatile&>(f1);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ namespace detail`
`68`	`68`	`template <int keywords, int init_args>`
`69`	`69`	`struct more_keywords_than_init_arguments`
`70`	`70`	`{`
`71`		`- typedef char too_many_keywords[init_args - keywords >= 0 ? 1 : -1];`
	`71`	`+ typedef char too_many_keywords[init_args - keywords >= 0 ? 1 : -1] BOOST_ATTRIBUTE_UNUSED;`
`72`	`72`	`};`
`73`	`73`	`}`
`74`	`74`
`@@ -224,7 +224,7 @@ class init : public init_base<init<BOOST_PYTHON_OVERLOAD_ARGS> >`
`224`	`224`	`{`
`225`	`225`	`typedef typename detail::error::more_keywords_than_init_arguments<`
`226`	`226`	`N, n_arguments::value + 1`
`227`		`- >::too_many_keywords assertion;`
	`227`	`+ >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`template <std::size_t N>`
`@@ -233,7 +233,7 @@ class init : public init_base<init<BOOST_PYTHON_OVERLOAD_ARGS> >`
`233`	`233`	`{`
`234`	`234`	`typedef typename detail::error::more_keywords_than_init_arguments<`
`235`	`235`	`N, n_arguments::value + 1`
`236`		`- >::too_many_keywords assertion;`
	`236`	`+ >::too_many_keywords assertion BOOST_ATTRIBUTE_UNUSED;`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`template <class CallPoliciesT>`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ void assert_destructions(int n)`
`38`	`38`	`int main()`
`39`	`39`	`{`
`40`	`40`	`assert_destructions(0);`
`41`		`- typedef int a[2];`
`42`	`41`
`43`	`42`	`foo* f1 = new foo;`
`44`	`43`	`boost::python::detail::destroy_referent<foo const volatile&>(f1);`