feedc0de/boost_fusion
1
0
Fork 0
forked from boostorg/fusion
Code Pull Requests Activity

More optimization.

Browse Source
This commit is contained in:
Kohei Takahashi
2016-02-16 00:40:27 +09:00
parent c9c2c3bad6
commit 9b43ac8ee0
9 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/fusion/adapted/adt/adapt_adt.hpp
View File

@ -44,7 +44,7 @@
TEMPLATE_PARAMS_SEQ, \ TEMPLATE_PARAMS_SEQ, \
NAME_SEQ, \ NAME_SEQ, \
I, \ I, \
BOOST_PP_IF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY), \ BOOST_PP_IIF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY), \
BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR(ATTRIBUTE), \ BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR(ATTRIBUTE), \
BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE), \ BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE), \
BOOST_PP_LESS( \ BOOST_PP_LESS( \

2
include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp
View File

@ -46,7 +46,7 @@
TEMPLATE_PARAMS_SEQ, \ TEMPLATE_PARAMS_SEQ, \
NAME_SEQ, \ NAME_SEQ, \
I, \ I, \
BOOST_PP_IF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY), \ BOOST_PP_IIF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY), \
BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR(ATTRIBUTE), \ BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR(ATTRIBUTE), \
BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE), \ BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE), \
BOOST_PP_LESS( \ BOOST_PP_LESS( \

2
include/boost/fusion/adapted/adt/detail/adapt_base_assoc_attr_filler.hpp
View File

@ -44,7 +44,7 @@
BOOST_FUSION_ADAPT_ASSOC_ADT_FILLER_0 BOOST_FUSION_ADAPT_ASSOC_ADT_FILLER_0
#define BOOST_FUSION_ADAPT_ASSOC_ADT_WRAP_ATTR(A, B, C, D, E) \ #define BOOST_FUSION_ADAPT_ASSOC_ADT_WRAP_ATTR(A, B, C, D, E) \
BOOST_PP_IF(BOOST_MPL_PP_TOKEN_EQUAL(auto, A), \ BOOST_PP_IIF(BOOST_MPL_PP_TOKEN_EQUAL(auto, A), \
((3, (C,D,E))), \ ((3, (C,D,E))), \
((5, (A,B,C,D,E))) \ ((5, (A,B,C,D,E))) \
) )

6
include/boost/fusion/adapted/adt/detail/adapt_base_attr_filler.hpp
View File

@ -16,7 +16,7 @@
#include <boost/mpl/aux_/preprocessor/token_equal.hpp> #include <boost/mpl/aux_/preprocessor/token_equal.hpp>
#include <boost/preprocessor/arithmetic/sub.hpp> #include <boost/preprocessor/arithmetic/sub.hpp>
#include <boost/preprocessor/control/if.hpp> #include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/logical/or.hpp> #include <boost/preprocessor/logical/or.hpp>
#include <boost/preprocessor/tuple/elem.hpp> #include <boost/preprocessor/tuple/elem.hpp>
#include <boost/preprocessor/variadic/to_seq.hpp> #include <boost/preprocessor/variadic/to_seq.hpp>
@ -46,7 +46,7 @@
# define BOOST_FUSION_ADAPT_ADT_FILLER_1_END # define BOOST_FUSION_ADAPT_ADT_FILLER_1_END
# define BOOST_FUSION_ADAPT_ADT_FILLER(...) \ # define BOOST_FUSION_ADAPT_ADT_FILLER(...) \
BOOST_PP_IF( \ BOOST_PP_IIF( \
BOOST_PP_OR( \ BOOST_PP_OR( \
BOOST_MPL_PP_TOKEN_EQUAL(auto, \ BOOST_MPL_PP_TOKEN_EQUAL(auto, \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__)), \ BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__)), \
@ -81,7 +81,7 @@
# define BOOST_FUSION_ADAPT_ADT_FILLER_1_END # define BOOST_FUSION_ADAPT_ADT_FILLER_1_END
# define BOOST_FUSION_ADAPT_ADT_WRAP_ATTR(A, B, C, D) \ # define BOOST_FUSION_ADAPT_ADT_WRAP_ATTR(A, B, C, D) \
BOOST_PP_IF(BOOST_MPL_PP_TOKEN_EQUAL(auto, A), \ BOOST_PP_IIF(BOOST_MPL_PP_TOKEN_EQUAL(auto, A), \
((2, (C,D))), \ ((2, (C,D))), \
((4, (A,B,C,D))) \ ((4, (A,B,C,D))) \
) )

4
include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
View File

@ -13,7 +13,7 @@
#include <boost/fusion/support/config.hpp> #include <boost/fusion/support/config.hpp>
#include <boost/preprocessor/cat.hpp> #include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/empty.hpp> #include <boost/preprocessor/empty.hpp>
#include <boost/preprocessor/control/if.hpp> #include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/comparison/less.hpp> #include <boost/preprocessor/comparison/less.hpp>
#include <boost/type_traits/add_reference.hpp> #include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/is_const.hpp> #include <boost/type_traits/is_const.hpp>
@ -45,7 +45,7 @@
NAME_SEQ, \ NAME_SEQ, \
IS_VIEW, \ IS_VIEW, \
I, \ I, \
BOOST_PP_IF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY), \ BOOST_PP_IIF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY), \
BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR(ATTRIBUTE), \ BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR(ATTRIBUTE), \
BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE), \ BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE), \
BOOST_PP_IIF(BOOST_PP_LESS( \ BOOST_PP_IIF(BOOST_PP_LESS( \

4
include/boost/fusion/adapted/struct/adapt_struct.hpp
View File

@ -14,7 +14,7 @@
#include <boost/preprocessor/config/config.hpp> #include <boost/preprocessor/config/config.hpp>
#include <boost/preprocessor/cat.hpp> #include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/empty.hpp> #include <boost/preprocessor/empty.hpp>
#include <boost/preprocessor/control/if.hpp> #include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/comparison/less.hpp> #include <boost/preprocessor/comparison/less.hpp>
#include <boost/preprocessor/seq/seq.hpp> #include <boost/preprocessor/seq/seq.hpp>
#include <boost/preprocessor/variadic/to_seq.hpp> #include <boost/preprocessor/variadic/to_seq.hpp>
@ -44,7 +44,7 @@
NAME_SEQ, \ NAME_SEQ, \
IS_VIEW, \ IS_VIEW, \
I, \ I, \
BOOST_PP_IF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY), \ BOOST_PP_IIF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY), \
BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR(ATTRIBUTE), \ BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR(ATTRIBUTE), \
BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE), \ BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE), \
BOOST_PP_LESS( \ BOOST_PP_LESS( \

2
include/boost/fusion/adapted/struct/detail/adapt_base.hpp
View File

@ -274,7 +274,7 @@ namespace boost
struct struct_is_view< \ struct struct_is_view< \
BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ) \ BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ) \
> \ > \
: mpl::BOOST_PP_IF(IS_VIEW,true_,false_) \ : mpl::BOOST_PP_IIF(IS_VIEW,true_,false_) \
{}; \ {}; \
} \ } \
} \ } \

6
include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
View File

@ -16,7 +16,7 @@
#include <boost/mpl/aux_/preprocessor/token_equal.hpp> #include <boost/mpl/aux_/preprocessor/token_equal.hpp>
#include <boost/preprocessor/config/config.hpp> #include <boost/preprocessor/config/config.hpp>
#include <boost/preprocessor/control/if.hpp> #include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/arithmetic/sub.hpp> #include <boost/preprocessor/arithmetic/sub.hpp>
#include <boost/preprocessor/variadic/size.hpp> #include <boost/preprocessor/variadic/size.hpp>
#include <boost/preprocessor/variadic/elem.hpp> #include <boost/preprocessor/variadic/elem.hpp>
@ -32,7 +32,7 @@
BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0 BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0
#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(...) \ #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(...) \
BOOST_PP_IF( \ BOOST_PP_IIF( \
BOOST_MPL_PP_TOKEN_EQUAL(auto, BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__)), \ BOOST_MPL_PP_TOKEN_EQUAL(auto, BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__)), \
((2, \ ((2, \
(BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__), \ (BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__), \
@ -53,7 +53,7 @@
BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0 BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0
#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(X, Y, Z) \ #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(X, Y, Z) \
BOOST_PP_IF(BOOST_MPL_PP_TOKEN_EQUAL(auto, X), \ BOOST_PP_IIF(BOOST_MPL_PP_TOKEN_EQUAL(auto, X), \
((2, (Y,Z))), \ ((2, (Y,Z))), \
((3, (X,Y,Z))) \ ((3, (X,Y,Z))) \
) )

16
include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp
View File

@ -16,7 +16,9 @@
#include <boost/mpl/aux_/preprocessor/token_equal.hpp> #include <boost/mpl/aux_/preprocessor/token_equal.hpp>
#include <boost/preprocessor/config/config.hpp> #include <boost/preprocessor/config/config.hpp>
#include <boost/preprocessor/control/if.hpp> #include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/control/expr_iif.hpp>
#include <boost/preprocessor/logical/compl.hpp>
#include <boost/preprocessor/tuple/elem.hpp> #include <boost/preprocessor/tuple/elem.hpp>
#include <boost/preprocessor/seq/for_each.hpp> #include <boost/preprocessor/seq/for_each.hpp>
#include <boost/preprocessor/seq/push_front.hpp> #include <boost/preprocessor/seq/push_front.hpp>
@ -36,7 +38,7 @@
#define BOOST_FUSION_ADAPT_STRUCT_FILLER_1_END #define BOOST_FUSION_ADAPT_STRUCT_FILLER_1_END
#define BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(X, Y) \ #define BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(X, Y) \
BOOST_PP_IF(BOOST_MPL_PP_TOKEN_EQUAL(auto, BOOST_PP_EXPAND(X)), \ BOOST_PP_IIF(BOOST_MPL_PP_TOKEN_EQUAL(auto, BOOST_PP_EXPAND(X)), \
((1, (Y))), \ ((1, (Y))), \
((2, (X,Y))) \ ((2, (X,Y))) \
) )
@ -51,12 +53,10 @@
#if BOOST_PP_VARIADICS #if BOOST_PP_VARIADICS
# define BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTES_FILLER_OP(r, unused, elem) \ # define BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTES_FILLER_OP(r, unused, elem) \
BOOST_PP_IF(BOOST_FUSION_PP_IS_SEQ(elem), \ BOOST_PP_IIF(BOOST_FUSION_PP_IS_SEQ(elem), \
BOOST_PP_CAT( BOOST_FUSION_ADAPT_STRUCT_FILLER_0 elem ,_END), \ BOOST_PP_CAT(BOOST_FUSION_ADAPT_STRUCT_FILLER_0 elem ,_END), \
BOOST_PP_IF(BOOST_PP_IS_EMPTY(elem), \ BOOST_PP_EXPR_IIF(BOOST_PP_COMPL(BOOST_PP_IS_EMPTY(elem)), \
BOOST_PP_EMPTY(), \ BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(auto, elem)))
BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(auto,elem))\
)
# define BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTES_FILLER(VA_ARGS_SEQ) \ # define BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTES_FILLER(VA_ARGS_SEQ) \
BOOST_PP_SEQ_PUSH_FRONT( \ BOOST_PP_SEQ_PUSH_FRONT( \