feedc0de/boost_mpl
1
0
Fork 0
forked from boostorg/mpl
Code Pull Requests Activity

MPL: merge fix for ticket #4061

Browse Source 
[SVN r61584]
This commit is contained in:
Aleksey Gurtovoy
2010-04-26 18:48:26 +00:00
parent 62d52d9d8b
commit 31a2c78a5a
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp
View File

@@ -6,11 +6,10 @@
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
// //
// Preprocessed version of "boost/mpl/aux_/template_arity.hpp" header // *Preprocessed* version of the main "template_arity.hpp" header
// -- DO NOT modify by hand! // -- DO NOT modify by hand!
namespace boost { namespace mpl { namespace aux { namespace boost { namespace mpl { namespace aux {
template< int N > struct arity_tag template< int N > struct arity_tag
{ {
typedef char (&type)[N + 1]; typedef char (&type)[N + 1];
@@ -23,7 +22,6 @@ struct max_arity
{ {
BOOST_STATIC_CONSTANT(int, value = BOOST_STATIC_CONSTANT(int, value =
( C6 > 0 ? C6 : ( C5 > 0 ? C5 : ( C4 > 0 ? C4 : ( C3 > 0 ? C3 : ( C2 > 0 ? C2 : ( C1 > 0 ? C1 : -1 ) ) ) ) ) ) ( C6 > 0 ? C6 : ( C5 > 0 ? C5 : ( C4 > 0 ? C4 : ( C3 > 0 ? C3 : ( C2 > 0 ? C2 : ( C1 > 0 ? C1 : -1 ) ) ) ) ) )
); );
}; };
@@ -83,7 +81,7 @@ template< typename F, int N >
struct template_arity_impl struct template_arity_impl
{ {
BOOST_STATIC_CONSTANT(int, value = BOOST_STATIC_CONSTANT(int, value =
sizeof(arity_helper(type_wrapper<F>(), arity_tag<N>())) - 1 sizeof(::boost::mpl::aux::arity_helper(type_wrapper<F>(), arity_tag<N>())) - 1
); );
}; };
@@ -92,9 +90,7 @@ struct template_arity
{ {
BOOST_STATIC_CONSTANT(int, value = ( BOOST_STATIC_CONSTANT(int, value = (
max_arity< template_arity_impl< F,1 >::value, template_arity_impl< F,2 >::value, template_arity_impl< F,3 >::value, template_arity_impl< F,4 >::value, template_arity_impl< F,5 >::value, template_arity_impl< F,6 >::value >::value max_arity< template_arity_impl< F,1 >::value, template_arity_impl< F,2 >::value, template_arity_impl< F,3 >::value, template_arity_impl< F,4 >::value, template_arity_impl< F,5 >::value, template_arity_impl< F,6 >::value >::value
)); ));
typedef mpl::int_<value> type; typedef mpl::int_<value> type;
}; };

2
include/boost/mpl/aux_/template_arity.hpp
View File

@@ -98,7 +98,7 @@ template< typename F, BOOST_MPL_AUX_NTTP_DECL(int, N) >
struct template_arity_impl struct template_arity_impl
{ {
BOOST_STATIC_CONSTANT(int, value = BOOST_STATIC_CONSTANT(int, value =
sizeof(arity_helper(type_wrapper<F>(),arity_tag<N>())) - 1 sizeof(::boost::mpl::aux::arity_helper(type_wrapper<F>(),arity_tag<N>())) - 1
); );
}; };