Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/tti/detail/dtemplate_params.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/tti/detail/dtemplate_params.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/tti/detail/dtemplate_params.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -9,6 +9,7 @@ #include <boost/config.hpp> #include <boost/mpl/bool.hpp> +#include <boost/mpl/eval_if.hpp> #include <boost/mpl/has_xxx.hpp> #include <boost/preprocessor/arithmetic/add.hpp> #include <boost/preprocessor/arithmetic/sub.hpp> @@ -19,6 +20,7 @@ #include <boost/preprocessor/repetition/enum.hpp> #include <boost/preprocessor/array/enum.hpp> #include <boost/preprocessor/array/size.hpp> +#include <boost/type_traits/is_class.hpp> #if !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE) @@ -33,8 +35,9 @@ typename BOOST_TTI_DETAIL_TP_FALLBACK_ \ = boost::mpl::bool_< BOOST_PP_ARRAY_ELEM(3, args) > \ > \ - class BOOST_PP_ARRAY_ELEM(0, args) \ + struct BOOST_PP_ARRAY_ELEM(0, args) \ { \ + private: \ introspect_macro(args) \ public: \ static const bool value \ @@ -186,15 +189,31 @@ #endif // !BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE -#define BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpArray) \ +#define BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS_OP(trait,name,tpArray) \ BOOST_TTI_DETAIL_TRAIT_CALL_HAS_TEMPLATE_CHECK_PARAMS(BOOST_PP_CAT(trait,_detail),name,tpArray) \ template<class BOOST_TTI_DETAIL_TP_T> \ - struct trait : \ + struct BOOST_PP_CAT(trait,_detail_cp_op) : \ BOOST_PP_CAT(trait,_detail)<BOOST_TTI_DETAIL_TP_T> \ { \ }; \ /**/ +#define BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpArray) \ + BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS_OP(trait,name,tpArray) \ + template<class BOOST_TTI_DETAIL_TP_T> \ + struct trait \ + { \ + typedef typename \ + boost::mpl::eval_if \ + < \ + boost::is_class<BOOST_TTI_DETAIL_TP_T>, \ + BOOST_PP_CAT(trait,_detail_cp_op)<BOOST_TTI_DETAIL_TP_T>, \ + boost::mpl::false_ \ + >::type type; \ + BOOST_STATIC_CONSTANT(bool,value=type::value); \ + }; \ +/**/ + #if !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE) #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1400)