|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r73995 - in trunk/boost/tti: . detail mf
From: eldiener_at_[hidden]
Date: 2011-08-21 18:59:32
Author: eldiener
Date: 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
New Revision: 73995
URL: http://svn.boost.org/trac/boost/changeset/73995
Log:
Make template parameters have a TTI specific name so as not to conflict with potential template parameters in enclosing classes.
Text files modified:
trunk/boost/tti/comp_mem_fun.hpp | 16 +++++-----
trunk/boost/tti/comp_static_mem_fun.hpp | 20 ++++++------
trunk/boost/tti/detail/dtemplate_params.hpp | 59 ----------------------------------------
trunk/boost/tti/mem_data.hpp | 12 ++++----
trunk/boost/tti/mem_fun.hpp | 20 ++++++------
trunk/boost/tti/mem_type.hpp | 10 +++---
trunk/boost/tti/mf/mf_mem_data.hpp | 22 +++++++-------
trunk/boost/tti/mf/mf_mem_fun.hpp | 34 +++++++++++-----------
trunk/boost/tti/mf/mf_mem_type.hpp | 28 +++++++++---------
trunk/boost/tti/mf/mf_static_mem_data.hpp | 22 +++++++-------
trunk/boost/tti/mf/mf_static_mem_fun.hpp | 34 +++++++++++-----------
trunk/boost/tti/mf/mf_template.hpp | 16 +++++-----
trunk/boost/tti/mf/mf_template_params.hpp | 18 ++++++------
trunk/boost/tti/mf/mf_type.hpp | 22 +++++++-------
trunk/boost/tti/static_mem_data.hpp | 20 ++++++------
trunk/boost/tti/static_mem_fun.hpp | 20 ++++++------
trunk/boost/tti/template.hpp | 8 ++--
trunk/boost/tti/template_params.hpp | 8 ++--
trunk/boost/tti/type.hpp | 16 +++++-----
trunk/boost/tti/vm_template_params.hpp | 8 ++--
20 files changed, 177 insertions(+), 236 deletions(-)
Modified: trunk/boost/tti/comp_mem_fun.hpp
==============================================================================
--- trunk/boost/tti/comp_mem_fun.hpp (original)
+++ trunk/boost/tti/comp_mem_fun.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -34,9 +34,9 @@
The metafunction types and return:
- T = the member function type,
- in the form of a member function pointer - 'return_type (Class::*)(parameter_types...)',
- in which to look for our 'name'.
+ TTI_T = the member function type,
+ in the form of a member function pointer - 'return_type (Class::*)(parameter_types...)',
+ in which to look for our 'name'.
returns = 'value' is true if the 'name' exists, with the appropriate type,
otherwise 'value' is false.
@@ -44,9 +44,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
- template<class T> \
+ template<class TTI_T> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<T> \
+ BOOST_PP_CAT(trait,_detail)<TTI_T> \
{ \
}; \
/**/
@@ -60,9 +60,9 @@
The metafunction types and return:
- T = the member function type,
- in the form of a member function pointer - 'return_type (Class::*)(parameter_types...)',
- in which to look for our 'name'.
+ TTI_T = the member function type,
+ in the form of a member function pointer - 'return_type (Class::*)(parameter_types...)',
+ in which to look for our 'name'.
returns = 'value' is true if the 'name' exists, with the appropriate type,
otherwise 'value' is false.
Modified: trunk/boost/tti/comp_static_mem_fun.hpp
==============================================================================
--- trunk/boost/tti/comp_static_mem_fun.hpp (original)
+++ trunk/boost/tti/comp_static_mem_fun.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -34,11 +34,11 @@
The metafunction types and return:
- T = the enclosing type.
+ TTI_T = the enclosing type.
- Type = the static member function type,
- in the form of a composite function type - 'return_type (parameter_types...)',
- in which to look for our 'name'.
+ TTI_Type = the static member function type,
+ in the form of a composite function type - 'return_type (parameter_types...)',
+ in which to look for our 'name'.
returns = 'value' is true if the 'name' exists within the enclosing type,
with the appropriate type,
@@ -47,9 +47,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
TTI_DETAIL_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
- template<class T,class Type> \
+ template<class TTI_T,class TTI_Type> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<T,Type> \
+ BOOST_PP_CAT(trait,_detail)<TTI_T,TTI_Type> \
{ \
}; \
/**/
@@ -63,11 +63,11 @@
The metafunction types and return:
- T = the enclosing type.
+ TTI_T = the enclosing type.
- Type = the static member function type,
- in the form of a composite function type - 'return_type (parameter_types...)',
- in which to look for our 'name'.
+ TTI_Type = the static member function type,
+ in the form of a composite function type - 'return_type (parameter_types...)',
+ in which to look for our 'name'.
returns = 'value' is true if the 'name' exists within the enclosing type,
with the appropriate type,
Modified: trunk/boost/tti/detail/dtemplate_params.hpp
==============================================================================
--- trunk/boost/tti/detail/dtemplate_params.hpp (original)
+++ trunk/boost/tti/detail/dtemplate_params.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -46,29 +46,6 @@
}; \
/**/
-#define TTI_DETAIL_MTFC_HAS_MEMBER_IMPLEMENTATION(args,introspect_macro) \
- struct BOOST_PP_ARRAY_ELEM(0, args) \
- { \
- template \
- < \
- typename T, \
- typename fallback_ \
- = boost::mpl::bool_< BOOST_PP_ARRAY_ELEM(3, args) > \
- > \
- class apply \
- { \
- introspect_macro(args) \
- public: \
- static const bool value \
- = BOOST_MPL_HAS_MEMBER_INTROSPECTION_NAME(args)< T >::value; \
- typedef typename BOOST_MPL_HAS_MEMBER_INTROSPECTION_NAME(args) \
- < \
- T \
- >::type type; \
- }; \
- }; \
-/**/
-
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
#define TTI_DETAIL_HAS_MEMBER_MULTI_SUBSTITUTE(z,n,args) \
@@ -190,18 +167,6 @@
) \
/**/
-#define TTI_DETAIL_MTFC_HAS_MEMBER_WITH_TEMPLATE_SFINAE(args) \
- TTI_DETAIL_HAS_MEMBER_SUBSTITUTE_WITH_TEMPLATE_SFINAE \
- ( \
- args \
- ) \
- TTI_DETAIL_MTFC_HAS_MEMBER_IMPLEMENTATION \
- ( \
- args, \
- TTI_DETAIL_HAS_MEMBER_INTROSPECT_WITH_TEMPLATE_SFINAE \
- ) \
-/**/
-
#endif // !BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
#else // !!defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE)
@@ -226,16 +191,6 @@
) \
/**/
-#define TTI_DETAIL_MTFC_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpSeq) \
- struct trait \
- { \
- TTI_DETAIL_HAS_MEMBER_WITH_FUNCTION_SFINAE \
- ( \
- ( BOOST_PP_ADD(BOOST_PP_SEQ_SIZE(tpSeq),4), ( apply, name, 1, false, BOOST_PP_SEQ_ENUM(tpSeq) ) ) \
- ) \
- }; \
-/**/
-
#else // !!BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
#define TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpSeq) \
@@ -245,13 +200,6 @@
) \
/**/
-#define TTI_DETAIL_MTFC_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpSeq) \
- TTI_DETAIL_MTFC_HAS_MEMBER_WITH_TEMPLATE_SFINAE \
- ( \
- ( BOOST_PP_ADD(BOOST_PP_SEQ_SIZE(tpSeq),4), ( trait, name, 1, false, BOOST_PP_SEQ_ENUM(tpSeq) ) ) \
- ) \
-/**/
-
#endif // !BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
#else // !!defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE)
@@ -259,13 +207,6 @@
TTI_DETAIL_SAME(trait,name) \
/**/
-#define TTI_DETAIL_MTFC_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpSeq) \
- struct trait \
- { \
- TTI_DETAIL_SAME(apply,name) \
- }; \
-/**/
-
#endif // !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE)
#endif // TTI_DETAIL_TEMPLATE_PARAMS_HPP
Modified: trunk/boost/tti/mem_data.hpp
==============================================================================
--- trunk/boost/tti/mem_data.hpp (original)
+++ trunk/boost/tti/mem_data.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -34,9 +34,9 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
- R = the type of the member data.
+ TTI_R = the type of the member data.
returns = 'value' is true if the 'name' exists, with the appropriate type,
otherwise 'value' is false.
@@ -44,9 +44,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_MEMBER_DATA(trait,name) \
TTI_DETAIL_TRAIT_HAS_MEMBER_DATA(trait,name) \
- template<class T,class R> \
+ template<class TTI_T,class TTI_R> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<typename BOOST_TTI_NAMESPACE::detail::ptmd<T,R>::type,typename boost::remove_const<T>::type> \
+ BOOST_PP_CAT(trait,_detail)<typename BOOST_TTI_NAMESPACE::detail::ptmd<TTI_T,TTI_R>::type,typename boost::remove_const<TTI_T>::type> \
{ \
}; \
/**/
@@ -60,9 +60,9 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
- R = the type of the member data.
+ TTI_R = the type of the member data.
returns = 'value' is true if the 'name' exists, with the appropriate type,
otherwise 'value' is false.
Modified: trunk/boost/tti/mem_fun.hpp
==============================================================================
--- trunk/boost/tti/mem_fun.hpp (original)
+++ trunk/boost/tti/mem_fun.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -36,13 +36,13 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
- R = the return type of the member function.
+ TTI_R = the return type of the member function.
- FS = an optional parameter which are the parameters of the member function as a boost::mpl forward sequence.
+ TTI_FS = an optional parameter which are the parameters of the member function as a boost::mpl forward sequence.
- TAG = an optional parameter which is a boost::function_types tag to apply to the member function.
+ TTI_TAG = an optional parameter which is a boost::function_types tag to apply to the member function.
returns = 'value' is true if the 'name' exists, with the appropriate type,
otherwise 'value' is false.
@@ -50,9 +50,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_MEMBER_FUNCTION(trait,name) \
TTI_DETAIL_TRAIT_HAS_MEMBER_FUNCTION(trait,name) \
- template<class T,class R,class FS = boost::mpl::vector<>,class TAG = boost::function_types::null_tag> \
+ template<class TTI_T,class TTI_R,class TTI_FS = boost::mpl::vector<>,class TTI_TAG = boost::function_types::null_tag> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<typename BOOST_TTI_NAMESPACE::detail::ptmf_seq<T,R,FS,TAG>::type,typename boost::remove_const<T>::type> \
+ BOOST_PP_CAT(trait,_detail)<typename BOOST_TTI_NAMESPACE::detail::ptmf_seq<TTI_T,TTI_R,TTI_FS,TTI_TAG>::type,typename boost::remove_const<TTI_T>::type> \
{ \
}; \
/**/
@@ -66,13 +66,13 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
- R = the return type of the member function.
+ TTI_R = the return type of the member function.
- FS = an optional parameter which are the parameters of the member function as a boost::mpl forward sequence.
+ TTI_FS = an optional parameter which are the parameters of the member function as a boost::mpl forward sequence.
- TAG = an optional parameter which is a boost::function_types tag to apply to the member function.
+ TTI_TAG = an optional parameter which is a boost::function_types tag to apply to the member function.
returns = 'value' is true if the 'name' exists, with the appropriate type,
otherwise 'value' is false.
Modified: trunk/boost/tti/mem_type.hpp
==============================================================================
--- trunk/boost/tti/mem_type.hpp (original)
+++ trunk/boost/tti/mem_type.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -36,7 +36,7 @@
The metafunction types and return:
- T = the enclosing type.<br />
+ TTI_T = the enclosing type.<br />
returns = 'type' is the inner type of 'name' if the inner type exists
within the enclosing type, else 'type' is an unspecified type.<br />
@@ -50,12 +50,12 @@
#define BOOST_TTI_TRAIT_MEMBER_TYPE(trait,name) \
TTI_DETAIL_TRAIT_HAS_TYPE_MEMBER_TYPE(trait,name) \
TTI_DETAIL_TRAIT_MEMBER_TYPE(trait,name) \
- template<class T> \
+ template<class TTI_T> \
struct trait : \
boost::mpl::eval_if \
< \
- BOOST_PP_CAT(trait,_detail)<T>, \
- BOOST_PP_CAT(trait,_detail_member_type)<T>, \
+ BOOST_PP_CAT(trait,_detail)<TTI_T>, \
+ BOOST_PP_CAT(trait,_detail_member_type)<TTI_T>, \
boost::mpl::identity<BOOST_TTI_NAMESPACE::detail::notype> \
> \
{ \
@@ -71,7 +71,7 @@
The metafunction types and return:
- T = the enclosing type.
+ TTI_T = the enclosing type.
returns = 'type' is the inner type of 'name' if the inner type exists
within the enclosing type, else 'type' is an unspecified type.
Modified: trunk/boost/tti/mf/mf_mem_data.hpp
==============================================================================
--- trunk/boost/tti/mf/mf_mem_data.hpp (original)
+++ trunk/boost/tti/mf/mf_mem_data.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -33,13 +33,13 @@
The metafunction types and return:
- HasMemberData = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_MEMBER_DATA ( or TTI_TRAIT_HAS_MEMBER_DATA ) macro.<br />
- The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_,_\>'.
- You can also use the metafunction class generated by the TTI_MTFC_HAS_MEMBER_DATA ( or TTI_MTFC_TRAIT_HAS_MEMBER_DATA ) macro.
+ TTI_HasMemberData = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_MEMBER_DATA ( or TTI_TRAIT_HAS_MEMBER_DATA ) macro.<br />
+ The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_,_\>'.
+ You can also use a metafunction class generated by boost::mpl::quote2.
- T = the enclosing type as a nullary metafunction.
+ TTI_T = the enclosing type as a nullary metafunction.
- R = the type of the member data as a nullary metafunction.
+ TTI_R = the type of the member data as a nullary metafunction.
returns = 'value' is true if the member data exists within the enclosing type,
otherwise 'value' is false.
@@ -47,16 +47,16 @@
*/
template
<
- class HasMemberData,
- class T,
- class R
+ class TTI_HasMemberData,
+ class TTI_T,
+ class TTI_R
>
struct mf_has_member_data :
boost::mpl::apply
<
- HasMemberData,
- typename T::type,
- typename R::type
+ TTI_HasMemberData,
+ typename TTI_T::type,
+ typename TTI_R::type
>::type
{
};
Modified: trunk/boost/tti/mf/mf_mem_fun.hpp
==============================================================================
--- trunk/boost/tti/mf/mf_mem_fun.hpp (original)
+++ trunk/boost/tti/mf/mf_mem_fun.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -38,18 +38,18 @@
The metafunction types and return:
- HasMemberFunction = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_MEMBER_FUNCTION ( or TTI_TRAIT_HAS_MEMBER_FUNCTION ) macro.<br />
- The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_,_\> ( or optionally 'metafunction\<_,_,_\> or ' 'metafunction\<_,_,_,_\> )'.
- You can also use the metafunction class generated by the TTI_MTFC_HAS_MEMBER_FUNCTION ( or TTI_MTFC_TRAIT_HAS_MEMBER_FUNCTION ) macro.
+ TTI_HasMemberFunction = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_MEMBER_FUNCTION ( or TTI_TRAIT_HAS_MEMBER_FUNCTION ) macro.<br />
+ The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_,_\> ( or optionally 'metafunction\<_,_,_\> or ' 'metafunction\<_,_,_,_\> )'.
+ You can also use a metafunction class generated by boost::mpl::quote4.
- T = the enclosing type as a nullary metafunction.
+ TTI_T = the enclosing type as a nullary metafunction.
- R = the return type of the member function as a nullary metafunction.
+ TTI_R = the return type of the member function as a nullary metafunction.
- FS = an optional parameter which is the parameters of the member function, each as a nullary metafunction, as a boost::mpl forward sequence.<br />
+ TTI_FS = an optional parameter which is the parameters of the member function, each as a nullary metafunction, as a boost::mpl forward sequence.<br />
This parameter defaults to boost::mpl::vector<>.
- TAG = an optional parameter which is a boost::function_types tag to apply to the member function.<br />
+ TTI_TAG = an optional parameter which is a boost::function_types tag to apply to the member function.<br />
This parameter defaults to boost::function_types::null_tag.
returns = 'value' is true if the member function exists within the enclosing type,
@@ -58,20 +58,20 @@
*/
template
<
- class HasMemberFunction,
- class T,
- class R,
- class FS = boost::mpl::vector<>,
- class TAG = boost::function_types::null_tag
+ class TTI_HasMemberFunction,
+ class TTI_T,
+ class TTI_R,
+ class TTI_FS = boost::mpl::vector<>,
+ class TTI_TAG = boost::function_types::null_tag
>
struct mf_has_member_function :
boost::mpl::apply
<
- HasMemberFunction,
- typename T::type,
- typename R::type,
- typename boost::mpl::transform<FS,BOOST_TTI_NAMESPACE::detail::tself<boost::mpl::_1> >::type,
- TAG
+ TTI_HasMemberFunction,
+ typename TTI_T::type,
+ typename TTI_R::type,
+ typename boost::mpl::transform<TTI_FS,BOOST_TTI_NAMESPACE::detail::tself<boost::mpl::_1> >::type,
+ TTI_TAG
>::type
{
};
Modified: trunk/boost/tti/mf/mf_mem_type.hpp
==============================================================================
--- trunk/boost/tti/mf/mf_mem_type.hpp (original)
+++ trunk/boost/tti/mf/mf_mem_type.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -35,21 +35,21 @@
The metafunction types and return:
- T = returned inner 'type' from invoking the macro metafunction generated by TTI_MEMBER_TYPE ( TTI_TRAIT_MEMBER_TYPE ) or from invoking boost::tti::mf_member_type.
+ TTI_T = returned inner 'type' from invoking the macro metafunction generated by TTI_MEMBER_TYPE ( TTI_TRAIT_MEMBER_TYPE ) or from invoking boost::tti::mf_member_type.
returns = 'value' is true if the type is valid, otherwise 'value' is false.
*/
template
<
- class T
+ class TTI_T
>
struct valid_member_type :
boost::mpl::not_
<
boost::is_same
<
- T,
+ TTI_T,
BOOST_TTI_NAMESPACE::detail::notype
>
>
@@ -61,21 +61,21 @@
The metafunction types and return:
- T = the nullary metafunction from invoking the macro metafunction generated by TTI_MEMBER_TYPE ( TTI_TRAIT_MEMBER_TYPE ) or from invoking boost::tti::mf_member_type.
+ TTI_T = the nullary metafunction from invoking the macro metafunction generated by TTI_MEMBER_TYPE ( TTI_TRAIT_MEMBER_TYPE ) or from invoking boost::tti::mf_member_type.
returns = 'value' is true if the type is valid, otherwise 'value' is false.
*/
template
<
- class T
+ class TTI_T
>
struct mf_valid_member_type :
boost::mpl::not_
<
boost::is_same
<
- typename T::type,
+ typename TTI_T::type,
BOOST_TTI_NAMESPACE::detail::notype
>
>
@@ -89,11 +89,11 @@
The metafunction types and return:
- MemberType = a Boost MPL lambda expression using the metafunction generated from the TTI_MEMBER_TYPE ( or TTI_TRAIT_MEMBER_TYPE ) macro.<br />
- The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_\>'.
- You can also use the metafunction class generated by the TTI_MTFC_MEMBER_TYPE ( or TTI_MTFC_TRAIT_MEMBER_TYPE ) macro.
+ TTI_MemberType = a Boost MPL lambda expression using the metafunction generated from the TTI_MEMBER_TYPE ( or TTI_TRAIT_MEMBER_TYPE ) macro.<br />
+ The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_\>'.
+ You can also use a metafunction class generated by boost::mpl::quote1.
- T = the enclosing type as a nullary metafunction.
+ TTI_T = the enclosing type as a nullary metafunction.
returns = 'type' is the inner type of the 'name' in TTI_MEMBER_TYPE ( or TTI_TRAIT_MEMBER_TYPE )
if the inner type exists within the enclosing type,
@@ -112,14 +112,14 @@
*/
template
<
- class MemberType,
- class T
+ class TTI_MemberType,
+ class TTI_T
>
struct mf_member_type :
boost::mpl::apply
<
- MemberType,
- typename T::type
+ TTI_MemberType,
+ typename TTI_T::type
>
{
};
Modified: trunk/boost/tti/mf/mf_static_mem_data.hpp
==============================================================================
--- trunk/boost/tti/mf/mf_static_mem_data.hpp (original)
+++ trunk/boost/tti/mf/mf_static_mem_data.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -33,13 +33,13 @@
The metafunction types and return:
- HasStaticMemberData = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_STATIC_MEMBER_DATA ( or TTI_TRAIT_HAS_STATIC_MEMBER_DATA ) macro.<br />
- The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_,_\>'.
- You can also use the metafunction class generated by the TTI_MTFC_HAS_STATIC_MEMBER_DATA ( or TTI_MTFC_TRAIT_HAS_STATIC_MEMBER_DATA ) macro.
+ TTI_HasStaticMemberData = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_STATIC_MEMBER_DATA ( or TTI_TRAIT_HAS_STATIC_MEMBER_DATA ) macro.<br />
+ The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_,_\>'.
+ You can also use a metafunction class generated by boost::mpl::quote2.
- T = the enclosing type as a nullary metafunction.
+ TTI_T = the enclosing type as a nullary metafunction.
- R = the type of the static member data as a nullary metafunction.
+ TTI_R = the type of the static member data as a nullary metafunction.
returns = 'value' is true if the member data exists within the enclosing type,
otherwise 'value' is false.
@@ -47,16 +47,16 @@
*/
template
<
- class HasStaticMemberData,
- class T,
- class R
+ class TTI_HasStaticMemberData,
+ class TTI_T,
+ class TTI_R
>
struct mf_has_static_member_data :
boost::mpl::apply
<
- HasStaticMemberData,
- typename T::type,
- typename R::type
+ TTI_HasStaticMemberData,
+ typename TTI_T::type,
+ typename TTI_R::type
>::type
{
};
Modified: trunk/boost/tti/mf/mf_static_mem_fun.hpp
==============================================================================
--- trunk/boost/tti/mf/mf_static_mem_fun.hpp (original)
+++ trunk/boost/tti/mf/mf_static_mem_fun.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -38,17 +38,17 @@
The metafunction types and return:
- HasStaticMemberFunction = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_STATIC_MEMBER_FUNCTION ( or TTI_TRAIT_HAS_STATIC_MEMBER_FUNCTION ) macro.<br />
- The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_,_\> ( or optionally 'metafunction\<_,_,_\> or ' 'metafunction\<_,_,_,_\> )'.
- You can also use the metafunction class generated by the TTI_MTFC_HAS_STATIC_MEMBER_FUNCTION ( or TTI_MTFC_TRAIT_HAS_STATIC_MEMBER_FUNCTION ) macro.
+ TTI_HasStaticMemberFunction = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_STATIC_MEMBER_FUNCTION ( or TTI_TRAIT_HAS_STATIC_MEMBER_FUNCTION ) macro.<br />
+ The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_,_\> ( or optionally 'metafunction\<_,_,_\> or ' 'metafunction\<_,_,_,_\> )'.
+ You can also use a metafunction class generated by boost::mpl::quote4.
- T = the enclosing type as a nullary metafunction.
+ TTI_T = the enclosing type as a nullary metafunction.
- R = the return type of the static member function as a nullary metafunction.
+ TTI_R = the return type of the static member function as a nullary metafunction.
- FS = an optional parameter which is the parameters of the static member function, each as a nullary metafunction, as a boost::mpl forward sequence.
+ TTI_FS = an optional parameter which is the parameters of the static member function, each as a nullary metafunction, as a boost::mpl forward sequence.
- TAG = an optional parameter which is a boost::function_types tag to apply to the static member function.
+ TTI_TAG = an optional parameter which is a boost::function_types tag to apply to the static member function.
returns = 'value' is true if the member function exists within the enclosing type,
otherwise 'value' is false.
@@ -56,20 +56,20 @@
*/
template
<
- class HasStaticMemberFunction,
- class T,
- class R,
- class FS = boost::mpl::vector<>,
- class TAG = boost::function_types::null_tag
+ class TTI_HasStaticMemberFunction,
+ class TTI_T,
+ class TTI_R,
+ class TTI_FS = boost::mpl::vector<>,
+ class TTI_TAG = boost::function_types::null_tag
>
struct mf_has_static_member_function :
boost::mpl::apply
<
- HasStaticMemberFunction,
- typename T::type,
- typename R::type,
- typename boost::mpl::transform<FS,BOOST_TTI_NAMESPACE::detail::tself<boost::mpl::_1> >::type,
- TAG
+ TTI_HasStaticMemberFunction,
+ typename TTI_T::type,
+ typename TTI_R::type,
+ typename boost::mpl::transform<TTI_FS,BOOST_TTI_NAMESPACE::detail::tself<boost::mpl::_1> >::type,
+ TTI_TAG
>::type
{
};
Modified: trunk/boost/tti/mf/mf_template.hpp
==============================================================================
--- trunk/boost/tti/mf/mf_template.hpp (original)
+++ trunk/boost/tti/mf/mf_template.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -33,11 +33,11 @@
The metafunction types and return:
- HasTemplate = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_TEMPLATE ( TTI_TRAIT_HAS_TEMPLATE ) macro.<br />
- The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_\>'.
- You can also use the metafunction class generated by the TTI_MTFC_HAS_TEMPLATE ( TTI_MTFC_TRAIT_HAS_TEMPLATE ) macro.
+ TTI_HasTemplate = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_TEMPLATE ( TTI_TRAIT_HAS_TEMPLATE ) macro.<br />
+ The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_\>'.
+ You can also use a metafunction class generated by boost::mpl::quote1.
- T = the enclosing type as a nullary metafunction.
+ TTI_T = the enclosing type as a nullary metafunction.
returns = 'value' is true if the template exists within the enclosing type,
otherwise 'value' is false.
@@ -45,14 +45,14 @@
*/
template
<
- class HasTemplate,
- class T
+ class TTI_HasTemplate,
+ class TTI_T
>
struct mf_has_template :
boost::mpl::apply
<
- HasTemplate,
- typename T::type
+ TTI_HasTemplate,
+ typename TTI_T::type
>::type
{
};
Modified: trunk/boost/tti/mf/mf_template_params.hpp
==============================================================================
--- trunk/boost/tti/mf/mf_template_params.hpp (original)
+++ trunk/boost/tti/mf/mf_template_params.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -33,12 +33,12 @@
The metafunction types and return:
- HasTemplateCheckParams = a Boost MPL lambda expression using the metafunction generated from either the TTI_HAS_TEMPLATE_CHECK_PARAMS ( TTI_TRAIT_HAS_TEMPLATE_CHECK_PARAMS )
- or TTI_VM_HAS_TEMPLATE_CHECK_PARAMS ( TTI_VM_TRAIT_HAS_TEMPLATE_CHECK_PARAMS ) macros.<br />
- The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_\>'.
- You can also use the metafunction class generated by either the TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS ( TTI_MTFC_TRAIT_HAS_TEMPLATE_CHECK_PARAMS ) macro or the TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS ( TTI_VM_MTFC_TRAIT_HAS_TEMPLATE_CHECK_PARAMS ) macro.
+ TTI_HasTemplateCheckParams = a Boost MPL lambda expression using the metafunction generated from either the TTI_HAS_TEMPLATE_CHECK_PARAMS ( TTI_TRAIT_HAS_TEMPLATE_CHECK_PARAMS )
+ or TTI_VM_HAS_TEMPLATE_CHECK_PARAMS ( TTI_VM_TRAIT_HAS_TEMPLATE_CHECK_PARAMS ) macros.<br />
+ The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_\>'.
+ You can also use a metafunction class generated by boost::mpl::quote1.
- T = The enclosing type as a nullary metafunction.
+ TTI_T = The enclosing type as a nullary metafunction.
returns = 'value' is true if the template exists within the enclosing type,
otherwise 'value' is false.
@@ -46,14 +46,14 @@
*/
template
<
- class HasTemplateCheckParams,
- class T
+ class TTI_HasTemplateCheckParams,
+ class TTI_T
>
struct mf_has_template_check_params :
boost::mpl::apply
<
- HasTemplateCheckParams,
- typename T::type
+ TTI_HasTemplateCheckParams,
+ typename TTI_T::type
>::type
{
};
Modified: trunk/boost/tti/mf/mf_type.hpp
==============================================================================
--- trunk/boost/tti/mf/mf_type.hpp (original)
+++ trunk/boost/tti/mf/mf_type.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -35,13 +35,13 @@
The metafunction types and return:
- HasType = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_TYPE ( or TTI_TRAIT_HAS_TYPE ) macro.<br />
- The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_\>' ( or optionally 'metafunction\<_,_\>' ).
- You can also use the metafunction class generated by the TTI_MTFC_HAS_TYPE ( or TTI_MTFC_TRAIT_HAS_TYPE ) macro.
+ TTI_HasType = a Boost MPL lambda expression using the metafunction generated from the TTI_HAS_TYPE ( or TTI_TRAIT_HAS_TYPE ) macro.<br />
+ The easiest way to generate the lambda expression is to use a Boost MPL placeholder expression of the form 'metafunction\<_\>' ( or optionally 'metafunction\<_,_\>' ).
+ You can also use a metafunction class generated by boost::mpl::quote2.
- T = the enclosing type as a nullary metafunction.
+ TTI_T = the enclosing type as a nullary metafunction.
- U = the type of the inner type as a nullary metafunction, as an optional parameter.
+ TTI_U = the type of the inner type as a nullary metafunction, as an optional parameter.
returns = 'value' is true if the type exists within the enclosing type
and, if type U is specified, the type is the same as the type U,
@@ -50,16 +50,16 @@
*/
template
<
- class HasType,
- class T,
- class U = boost::mpl::identity<BOOST_TTI_NAMESPACE::detail::notype>
+ class TTI_HasType,
+ class TTI_T,
+ class TTI_U = boost::mpl::identity<BOOST_TTI_NAMESPACE::detail::notype>
>
struct mf_has_type :
boost::mpl::apply
<
- HasType,
- typename T::type,
- typename U::type
+ TTI_HasType,
+ typename TTI_T::type,
+ typename TTI_U::type
>::type
{
};
Modified: trunk/boost/tti/static_mem_data.hpp
==============================================================================
--- trunk/boost/tti/static_mem_data.hpp (original)
+++ trunk/boost/tti/static_mem_data.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -33,11 +33,11 @@
The metafunction types and return:
- T = the enclosing type.
+ TTI_T = the enclosing type.
- Type = the static member data type,
- in the form of a data type,
- in which to look for our 'name'.
+ TTI_Type = the static member data type,
+ in the form of a data type,
+ in which to look for our 'name'.
returns = 'value' is true if the 'name' exists within the enclosing type,
with the appropriate type,
@@ -46,9 +46,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
- template<class T,class Type> \
+ template<class TTI_T,class TTI_Type> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<T,Type> \
+ BOOST_PP_CAT(trait,_detail)<TTI_T,TTI_Type> \
{ \
}; \
/**/
@@ -62,11 +62,11 @@
The metafunction types and return:
- T = the enclosing type.
+ TTI_T = the enclosing type.
- Type = the static member data type,
- in the form of a data type,
- in which to look for our 'name'.
+ TTI_Type = the static member data type,
+ in the form of a data type,
+ in which to look for our 'name'.
returns = 'value' is true if the 'name' exists within the enclosing type,
with the appropriate type,
Modified: trunk/boost/tti/static_mem_fun.hpp
==============================================================================
--- trunk/boost/tti/static_mem_fun.hpp (original)
+++ trunk/boost/tti/static_mem_fun.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -36,13 +36,13 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
- R = the return type of the static member function.
+ TTI_R = the return type of the static member function.
- FS = an optional parameter which are the parameters of the static member function as a boost::mpl forward sequence.
+ TTI_FS = an optional parameter which are the parameters of the static member function as a boost::mpl forward sequence.
- TAG = an optional parameter which is a boost::function_types tag to apply to the static member function.
+ TTI_TAG = an optional parameter which is a boost::function_types tag to apply to the static member function.
returns = 'value' is true if the 'name' exists, with the appropriate type,
otherwise 'value' is false.
@@ -50,9 +50,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_STATIC_MEMBER_FUNCTION(trait,name) \
TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_FUNCTION(trait,name) \
- template<class T,class R,class FS = boost::mpl::vector<>,class TAG = boost::function_types::null_tag> \
+ template<class TTI_T,class TTI_R,class TTI_FS = boost::mpl::vector<>,class TTI_TAG = boost::function_types::null_tag> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<T,typename BOOST_TTI_NAMESPACE::detail::tfunction_seq<R,FS,TAG>::type> \
+ BOOST_PP_CAT(trait,_detail)<TTI_T,typename BOOST_TTI_NAMESPACE::detail::tfunction_seq<TTI_R,TTI_FS,TTI_TAG>::type> \
{ \
}; \
/**/
@@ -66,13 +66,13 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
- R = the return type of the static member function.
+ TTI_R = the return type of the static member function.
- FS = an optional parameter which are the parameters of the static member function as a boost::mpl forward sequence.
+ TTI_FS = an optional parameter which are the parameters of the static member function as a boost::mpl forward sequence.
- TAG = an optional parameter which is a boost::function_types tag to apply to the static member function.
+ TTI_TAG = an optional parameter which is a boost::function_types tag to apply to the static member function.
returns = 'value' is true if the 'name' exists, with the appropriate type,
otherwise 'value' is false.
Modified: trunk/boost/tti/template.hpp
==============================================================================
--- trunk/boost/tti/template.hpp (original)
+++ trunk/boost/tti/template.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -33,7 +33,7 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
returns = 'value' is true if the 'name' template exists within the enclosing type,
otherwise 'value' is false.
@@ -43,9 +43,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_TEMPLATE(trait,name) \
BOOST_MPL_HAS_XXX_TEMPLATE_NAMED_DEF(BOOST_PP_CAT(trait,_detail_mpl), name, false) \
- template<class T> \
+ template<class TTI_T> \
struct trait : \
- BOOST_PP_CAT(trait,_detail_mpl)<T> \
+ BOOST_PP_CAT(trait,_detail_mpl)<TTI_T> \
{ \
}; \
/**/
@@ -59,7 +59,7 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
returns = 'value' is true if the 'name' template exists within the enclosing type,
otherwise 'value' is false.
Modified: trunk/boost/tti/template_params.hpp
==============================================================================
--- trunk/boost/tti/template_params.hpp (original)
+++ trunk/boost/tti/template_params.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -37,7 +37,7 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
returns = 'value' is true if the 'name' class template with the signature
as defined by the 'tpSeq' exists within the enclosing type,
@@ -46,9 +46,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpSeq) \
TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(BOOST_PP_CAT(trait,_detail),name,tpSeq) \
- template<class T> \
+ template<class TTI_T> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<T> \
+ BOOST_PP_CAT(trait,_detail)<TTI_T> \
{ \
}; \
/**/
@@ -66,7 +66,7 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
returns = 'value' is true if the 'name' class template with the signature
as defined by the 'tpSeq' exists within the enclosing type,
Modified: trunk/boost/tti/type.hpp
==============================================================================
--- trunk/boost/tti/type.hpp (original)
+++ trunk/boost/tti/type.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -34,9 +34,9 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
- U = the type of the inner type named 'name' as an optional parameter.
+ TTI_U = the type of the inner type named 'name' as an optional parameter.
returns = 'value' is true if the 'name' type exists within the enclosing type
and, if type U is specified, the 'name' type is the same as the type U,
@@ -45,13 +45,13 @@
*/
#define BOOST_TTI_TRAIT_HAS_TYPE(trait,name) \
TTI_DETAIL_TRAIT_HAS_TYPE(trait,name) \
- template<class T,class U = BOOST_TTI_NAMESPACE::detail::notype> \
+ template<class TTI_T,class TTI_U = BOOST_TTI_NAMESPACE::detail::notype> \
struct trait : \
BOOST_PP_CAT(trait,_detail) \
< \
- T, \
- U, \
- typename BOOST_PP_CAT(trait,_detail_mpl)<T>::type \
+ TTI_T, \
+ TTI_U, \
+ typename BOOST_PP_CAT(trait,_detail_mpl)<TTI_T>::type \
> \
{ \
}; \
@@ -66,9 +66,9 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
- U = the type of the inner type named 'name' as an optional parameter.
+ TTI_U = the type of the inner type named 'name' as an optional parameter.
returns = 'value' is true if the 'name' type exists within the enclosing type
and, if type U is specified, the 'name' type is the same as the type U,
Modified: trunk/boost/tti/vm_template_params.hpp
==============================================================================
--- trunk/boost/tti/vm_template_params.hpp (original)
+++ trunk/boost/tti/vm_template_params.hpp 2011-08-21 18:59:29 EDT (Sun, 21 Aug 2011)
@@ -38,7 +38,7 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
returns = 'value' is true if the 'name' class template, with the signature
as defined by the '...' variadic macro data, exists within the enclosing type,
@@ -47,10 +47,10 @@
*/
#define BOOST_TTI_VM_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,...) \
TTI_VM_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(BOOST_PP_CAT(trait,_detail),name,__VA_ARGS__) \
- template<class T> \
+ template<class TTI_T> \
struct trait \
{ \
- typedef typename BOOST_PP_CAT(trait,_detail)<T>::type type; \
+ typedef typename BOOST_PP_CAT(trait,_detail)<TTI_T>::type type; \
\
BOOST_STATIC_CONSTANT(bool,value=type::value); \
}; \
@@ -67,7 +67,7 @@
The metafunction types and return:
- T = the enclosing type in which to look for our 'name'.
+ TTI_T = the enclosing type in which to look for our 'name'.
returns = 'value' is true if the 'name' class template, with the signature
as defined by the '...' variadic macro data, exists within the enclosing type,
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk