|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r84526 - in trunk/boost/tti: . detail
From: eldiener_at_[hidden]
Date: 2013-05-27 01:56:45
Author: eldiener
Date: 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
New Revision: 84526
URL: http://svn.boost.org/trac/boost/changeset/84526
Log:
Updated template parameter names to start with BOOST_TTI.
Text files modified:
trunk/boost/tti/detail/dcomp_mem_fun.hpp | 18 ++++----
trunk/boost/tti/detail/dcomp_static_mem_fun.hpp | 8 ++--
trunk/boost/tti/detail/ddata.hpp | 8 ++--
trunk/boost/tti/detail/dftclass.hpp | 6 +-
trunk/boost/tti/detail/dfunction.hpp | 10 ++--
trunk/boost/tti/detail/dlambda.hpp | 8 ++--
trunk/boost/tti/detail/dmem_data.hpp | 74 ++++++++++++++++++++--------------------
trunk/boost/tti/detail/dmem_fun.hpp | 8 ++--
trunk/boost/tti/detail/dmem_type.hpp | 10 ++--
trunk/boost/tti/detail/dmetafunc.hpp | 6 +-
trunk/boost/tti/detail/dplaceholder.hpp | 8 ++--
trunk/boost/tti/detail/dptmf.hpp | 16 ++++----
trunk/boost/tti/detail/dstatic_mem_data.hpp | 44 +++++++++++-----------
trunk/boost/tti/detail/dstatic_mem_fun.hpp | 28 +++++++-------
trunk/boost/tti/detail/dtclass.hpp | 10 ++--
trunk/boost/tti/detail/dtemplate.hpp | 6 +-
trunk/boost/tti/detail/dtemplate_params.hpp | 22 +++++-----
trunk/boost/tti/detail/dtfunction.hpp | 12 +++---
trunk/boost/tti/detail/dtype.hpp | 20 +++++-----
trunk/boost/tti/detail/dvm_template_params.hpp | 6 +-
trunk/boost/tti/has_data.hpp | 20 +++++-----
trunk/boost/tti/has_function.hpp | 26 +++++++-------
trunk/boost/tti/has_member_data.hpp | 2
trunk/boost/tti/has_member_function.hpp | 26 +++++++-------
trunk/boost/tti/has_static_member_data.hpp | 22 +++++-----
trunk/boost/tti/has_static_member_function.hpp | 24 ++++++------
trunk/boost/tti/has_template.hpp | 16 ++++----
trunk/boost/tti/has_type.hpp | 56 +++++++++++++++---------------
trunk/boost/tti/member_type.hpp | 36 +++++++++---------
29 files changed, 278 insertions(+), 278 deletions(-)
Modified: trunk/boost/tti/detail/dcomp_mem_fun.hpp
==============================================================================
--- trunk/boost/tti/detail/dcomp_mem_fun.hpp (original)
+++ trunk/boost/tti/detail/dcomp_mem_fun.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -17,28 +17,28 @@
#include <boost/type_traits/detail/yes_no_type.hpp>
#define BOOST_TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
- template<class T> \
+ template<class BOOST_TTI_DETAIL_TP_T> \
struct BOOST_PP_CAT(trait,_detail_hcmf) \
{ \
- template<class F> \
+ template<class BOOST_TTI_DETAIL_TP_F> \
struct cl_type : \
boost::remove_const \
< \
- typename BOOST_TTI_NAMESPACE::detail::class_type<F>::type \
+ typename BOOST_TTI_NAMESPACE::detail::class_type<BOOST_TTI_DETAIL_TP_F>::type \
> \
{ \
}; \
\
- template<T> \
+ template<BOOST_TTI_DETAIL_TP_T> \
struct helper; \
\
- template<class U> \
- static ::boost::type_traits::yes_type chkt(helper<&U::name> *); \
+ template<class BOOST_TTI_DETAIL_TP_U> \
+ static ::boost::type_traits::yes_type chkt(helper<&BOOST_TTI_DETAIL_TP_U::name> *); \
\
- template<class U> \
+ template<class BOOST_TTI_DETAIL_TP_U> \
static ::boost::type_traits::no_type chkt(...); \
\
- BOOST_STATIC_CONSTANT(bool,value=sizeof(chkt<typename cl_type<T>::type>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type)); \
+ BOOST_STATIC_CONSTANT(bool,value=sizeof(chkt<typename cl_type<BOOST_TTI_DETAIL_TP_T>::type>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type)); \
\
typedef boost::mpl::bool_<value> type; \
}; \
Modified: trunk/boost/tti/detail/dcomp_static_mem_fun.hpp
==============================================================================
--- trunk/boost/tti/detail/dcomp_static_mem_fun.hpp (original)
+++ trunk/boost/tti/detail/dcomp_static_mem_fun.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -15,10 +15,10 @@
#include <boost/tti/detail/dnullptr.hpp>
#define BOOST_TTI_DETAIL_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
- template<class T,class Type> \
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_TYPE> \
struct BOOST_PP_CAT(trait,_detail) \
{ \
- template<Type *> \
+ template<BOOST_TTI_DETAIL_TP_TYPE *> \
struct helper; \
\
template<class U> \
@@ -27,7 +27,7 @@
template<class U> \
static ::boost::type_traits::no_type chkt(...); \
\
- BOOST_STATIC_CONSTANT(bool,value=(boost::function_types::is_function<Type>::value) && (sizeof(chkt<T>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type))); \
+ BOOST_STATIC_CONSTANT(bool,value=(boost::function_types::is_function<BOOST_TTI_DETAIL_TP_TYPE>::value) && (sizeof(chkt<BOOST_TTI_DETAIL_TP_T>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type))); \
\
typedef boost::mpl::bool_<value> type; \
}; \
Modified: trunk/boost/tti/detail/ddata.hpp
==============================================================================
--- trunk/boost/tti/detail/ddata.hpp (original)
+++ trunk/boost/tti/detail/ddata.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -17,19 +17,19 @@
#define BOOST_TTI_DETAIL_TRAIT_HAS_DATA(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_MEMBER_DATA(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
- template<class ET,class DT> \
+ template<class BOOST_TTI_DETAIL_TP_ET,class BOOST_TTI_DETAIL_TP_DT> \
struct BOOST_PP_CAT(trait,_detail_hd) \
{ \
\
typedef typename \
BOOST_PP_CAT(trait,_detail_hmd) \
< \
- typename BOOST_TTI_NAMESPACE::detail::ptmd<ET,DT>::type, \
- typename boost::remove_const<ET>::type \
+ typename BOOST_TTI_NAMESPACE::detail::ptmd<BOOST_TTI_DETAIL_TP_ET,BOOST_TTI_DETAIL_TP_DT>::type, \
+ typename boost::remove_const<BOOST_TTI_DETAIL_TP_ET>::type \
>::type hmdtype; \
\
typedef typename \
- BOOST_PP_CAT(trait,_detail_hsd)<ET,DT>::type hsdtype; \
+ BOOST_PP_CAT(trait,_detail_hsd)<BOOST_TTI_DETAIL_TP_ET,BOOST_TTI_DETAIL_TP_DT>::type hsdtype; \
\
BOOST_STATIC_CONSTANT \
( \
Modified: trunk/boost/tti/detail/dftclass.hpp
==============================================================================
--- trunk/boost/tti/detail/dftclass.hpp (original)
+++ trunk/boost/tti/detail/dftclass.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2012
+// (C) Copyright Edward Diener 2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -19,14 +19,14 @@
{
namespace detail
{
- template<class F>
+ template<class BOOST_TTI_DETAIL_TP_F>
struct class_type :
boost::mpl::at
<
typename
boost::function_types::parameter_types
<
- F,
+ BOOST_TTI_DETAIL_TP_F,
boost::mpl::quote1
<
boost::mpl::identity
Modified: trunk/boost/tti/detail/dfunction.hpp
==============================================================================
--- trunk/boost/tti/detail/dfunction.hpp (original)
+++ trunk/boost/tti/detail/dfunction.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2012
+// (C) Copyright Edward Diener 2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -16,18 +16,18 @@
#define BOOST_TTI_DETAIL_TRAIT_HAS_FUNCTION(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_CALL_TYPES_MEMBER_FUNCTION(trait,name) \
BOOST_TTI_DETAIL_TRAIT_IMPL_HAS_STATIC_MEMBER_FUNCTION(trait,name) \
- template<class TTI_T,class TTI_R,class TTI_FS,class TTI_TAG> \
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_R,class BOOST_TTI_DETAIL_TP_FS,class BOOST_TTI_DETAIL_TP_TAG> \
struct BOOST_PP_CAT(trait,_detail_hf) \
{ \
\
typedef typename \
- BOOST_PP_CAT(trait,_detail_call_types)<TTI_T,TTI_R,TTI_FS,TTI_TAG>::type hmftype; \
+ BOOST_PP_CAT(trait,_detail_call_types)<BOOST_TTI_DETAIL_TP_T,BOOST_TTI_DETAIL_TP_R,BOOST_TTI_DETAIL_TP_FS,BOOST_TTI_DETAIL_TP_TAG>::type hmftype; \
\
typedef typename \
BOOST_PP_CAT(trait,_detail_ihsmf) \
< \
- TTI_T, \
- typename BOOST_TTI_NAMESPACE::detail::tfunction_seq<TTI_R,TTI_FS,TTI_TAG>::type \
+ BOOST_TTI_DETAIL_TP_T, \
+ typename BOOST_TTI_NAMESPACE::detail::tfunction_seq<BOOST_TTI_DETAIL_TP_R,BOOST_TTI_DETAIL_TP_FS,BOOST_TTI_DETAIL_TP_TAG>::type \
>::type hsmftype; \
\
BOOST_STATIC_CONSTANT \
Modified: trunk/boost/tti/detail/dlambda.hpp
==============================================================================
--- trunk/boost/tti/detail/dlambda.hpp (original)
+++ trunk/boost/tti/detail/dlambda.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2012
+// (C) Copyright Edward Diener 2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -18,12 +18,12 @@
{
namespace detail
{
- template <class TTI_T>
+ template <class BOOST_TTI_DETAIL_TP_T>
struct is_lambda_expression :
boost::mpl::or_
<
- BOOST_TTI_NAMESPACE::detail::is_metafunction_class<TTI_T>,
- BOOST_TTI_NAMESPACE::detail::is_placeholder_expression<TTI_T>
+ BOOST_TTI_NAMESPACE::detail::is_metafunction_class<BOOST_TTI_DETAIL_TP_T>,
+ BOOST_TTI_NAMESPACE::detail::is_placeholder_expression<BOOST_TTI_DETAIL_TP_T>
>
{
};
Modified: trunk/boost/tti/detail/dmem_data.hpp
==============================================================================
--- trunk/boost/tti/detail/dmem_data.hpp (original)
+++ trunk/boost/tti/detail/dmem_data.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -25,53 +25,53 @@
#if defined(BOOST_MSVC) || (BOOST_WORKAROUND(BOOST_GCC, >= 40400) && BOOST_WORKAROUND(BOOST_GCC, < 40600))
#define BOOST_TTI_DETAIL_TRAIT_HAS_MEMBER_DATA(trait,name) \
- template<class T,class C> \
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_C> \
struct BOOST_PP_CAT(trait,_detail_hmd) \
{ \
template<class> \
struct return_of; \
\
- template<class R,class IC> \
- struct return_of<R IC::*> \
+ template<class BOOST_TTI_DETAIL_TP_R,class BOOST_TTI_DETAIL_TP_IC> \
+ struct return_of<BOOST_TTI_DETAIL_TP_R BOOST_TTI_DETAIL_TP_IC::*> \
{ \
- typedef R type; \
+ typedef BOOST_TTI_DETAIL_TP_R type; \
}; \
\
- template<bool,typename U> \
+ template<bool,typename BOOST_TTI_DETAIL_TP_U> \
struct menable_if; \
\
- template<typename U> \
- struct menable_if<true,U> \
+ template<typename BOOST_TTI_DETAIL_TP_U> \
+ struct menable_if<true,BOOST_TTI_DETAIL_TP_U> \
{ \
- typedef U type; \
+ typedef BOOST_TTI_DETAIL_TP_U type; \
}; \
\
- template<typename U,typename V> \
- static ::boost::type_traits::yes_type check2(V U::*); \
+ template<typename BOOST_TTI_DETAIL_TP_U,typename BOOST_TTI_DETAIL_TP_V> \
+ static ::boost::type_traits::yes_type check2(BOOST_TTI_DETAIL_TP_V BOOST_TTI_DETAIL_TP_U::*); \
\
- template<typename U,typename V> \
- static ::boost::type_traits::no_type check2(U); \
+ template<typename BOOST_TTI_DETAIL_TP_U,typename BOOST_TTI_DETAIL_TP_V> \
+ static ::boost::type_traits::no_type check2(BOOST_TTI_DETAIL_TP_U); \
\
- template<typename U,typename V> \
+ template<typename BOOST_TTI_DETAIL_TP_U,typename BOOST_TTI_DETAIL_TP_V> \
static typename \
menable_if \
< \
- sizeof(check2<U,V>(&U::name))==sizeof(::boost::type_traits::yes_type), \
+ sizeof(check2<BOOST_TTI_DETAIL_TP_U,BOOST_TTI_DETAIL_TP_V>(&BOOST_TTI_DETAIL_TP_U::name))==sizeof(::boost::type_traits::yes_type), \
::boost::type_traits::yes_type \
> \
::type \
has_matching_member(int); \
\
- template<typename U,typename V> \
+ template<typename BOOST_TTI_DETAIL_TP_U,typename BOOST_TTI_DETAIL_TP_V> \
static ::boost::type_traits::no_type has_matching_member(...); \
\
- template<class U,class V> \
+ template<class BOOST_TTI_DETAIL_TP_U,class BOOST_TTI_DETAIL_TP_V> \
struct ttc_md \
{ \
- typedef boost::mpl::bool_<sizeof(has_matching_member<V,typename return_of<U>::type>(0))==sizeof(::boost::type_traits::yes_type)> type; \
+ typedef boost::mpl::bool_<sizeof(has_matching_member<BOOST_TTI_DETAIL_TP_V,typename return_of<BOOST_TTI_DETAIL_TP_U>::type>(0))==sizeof(::boost::type_traits::yes_type)> type; \
}; \
\
- typedef typename ttc_md<T,C>::type type; \
+ typedef typename ttc_md<BOOST_TTI_DETAIL_TP_T,BOOST_TTI_DETAIL_TP_C>::type type; \
\
BOOST_STATIC_CONSTANT(bool,value=type::value); \
\
@@ -84,9 +84,9 @@
#define BOOST_TTI_DETAIL_TRAIT_HAS_MEMBER_DATA(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_TYPES_MEMBER_FUNCTION(trait,name) \
- template<class T,class C> \
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_C> \
struct BOOST_PP_CAT(trait,_detail_hmd) : \
- BOOST_PP_CAT(trait,_detail_types)<T,C> \
+ BOOST_PP_CAT(trait,_detail_types)<BOOST_TTI_DETAIL_TP_T,BOOST_TTI_DETAIL_TP_C> \
{ \
}; \
/**/
@@ -100,44 +100,44 @@
namespace detail
{
- template<class T,class R>
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_R>
struct ptmd
{
- typedef R T::* type;
+ typedef BOOST_TTI_DETAIL_TP_R BOOST_TTI_DETAIL_TP_T::* type;
};
- template<class T>
+ template<class BOOST_TTI_DETAIL_TP_T>
struct dmem_check_ptmd :
- boost::mpl::identity<T>
+ boost::mpl::identity<BOOST_TTI_DETAIL_TP_T>
{
- BOOST_MPL_ASSERT((boost::function_types::is_member_object_pointer<T>));
+ BOOST_MPL_ASSERT((boost::function_types::is_member_object_pointer<BOOST_TTI_DETAIL_TP_T>));
};
- template<class T>
+ template<class BOOST_TTI_DETAIL_TP_T>
struct dmem_check_ptec :
- BOOST_TTI_NAMESPACE::detail::class_type<T>
+ BOOST_TTI_NAMESPACE::detail::class_type<BOOST_TTI_DETAIL_TP_T>
{
- BOOST_MPL_ASSERT((boost::function_types::is_member_object_pointer<T>));
+ BOOST_MPL_ASSERT((boost::function_types::is_member_object_pointer<BOOST_TTI_DETAIL_TP_T>));
};
- template<class T,class T2>
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_T2>
struct dmem_get_type :
boost::mpl::eval_if
<
- boost::is_same<T2,BOOST_TTI_NAMESPACE::detail::deftype>,
- BOOST_TTI_NAMESPACE::detail::dmem_check_ptmd<T>,
- BOOST_TTI_NAMESPACE::detail::ptmd<T,T2>
+ boost::is_same<BOOST_TTI_DETAIL_TP_T2,BOOST_TTI_NAMESPACE::detail::deftype>,
+ BOOST_TTI_NAMESPACE::detail::dmem_check_ptmd<BOOST_TTI_DETAIL_TP_T>,
+ BOOST_TTI_NAMESPACE::detail::ptmd<BOOST_TTI_DETAIL_TP_T,BOOST_TTI_DETAIL_TP_T2>
>
{
};
- template<class T,class T2>
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_T2>
struct dmem_get_enclosing :
boost::mpl::eval_if
<
- boost::is_same<T2,BOOST_TTI_NAMESPACE::detail::deftype>,
- BOOST_TTI_NAMESPACE::detail::dmem_check_ptec<T>,
- boost::mpl::identity<T>
+ boost::is_same<BOOST_TTI_DETAIL_TP_T2,BOOST_TTI_NAMESPACE::detail::deftype>,
+ BOOST_TTI_NAMESPACE::detail::dmem_check_ptec<BOOST_TTI_DETAIL_TP_T>,
+ boost::mpl::identity<BOOST_TTI_DETAIL_TP_T>
>
{
};
Modified: trunk/boost/tti/detail/dmem_fun.hpp
==============================================================================
--- trunk/boost/tti/detail/dmem_fun.hpp (original)
+++ trunk/boost/tti/detail/dmem_fun.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -60,11 +60,11 @@
#define BOOST_TTI_DETAIL_TRAIT_CHECK_HAS_COMP_MEMBER_FUNCTION(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
- template<class TTI_T> \
+ template<class BOOST_TTI_DETAIL_TP_T> \
struct BOOST_PP_CAT(trait,_detail_check_comp) : \
- BOOST_PP_CAT(trait,_detail_hcmf)<TTI_T> \
+ BOOST_PP_CAT(trait,_detail_hcmf)<BOOST_TTI_DETAIL_TP_T> \
{ \
- BOOST_MPL_ASSERT((boost::function_types::is_member_function_pointer<TTI_T>)); \
+ BOOST_MPL_ASSERT((boost::function_types::is_member_function_pointer<BOOST_TTI_DETAIL_TP_T>)); \
}; \
/**/
Modified: trunk/boost/tti/detail/dmem_type.hpp
==============================================================================
--- trunk/boost/tti/detail/dmem_type.hpp (original)
+++ trunk/boost/tti/detail/dmem_type.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -13,20 +13,20 @@
#define BOOST_TTI_DETAIL_TRAIT_HAS_TYPE_MEMBER_TYPE(trait,name) \
BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(BOOST_PP_CAT(trait,_detail_mpl), name, false) \
- template<class T> \
+ template<class BOOST_TTI_DETAIL_TP_T> \
struct BOOST_PP_CAT(trait,_detail) \
{ \
- typedef typename BOOST_PP_CAT(trait,_detail_mpl)<T>::type type; \
+ typedef typename BOOST_PP_CAT(trait,_detail_mpl)<BOOST_TTI_DETAIL_TP_T>::type type; \
\
BOOST_STATIC_CONSTANT(bool,value=type::value); \
}; \
/**/
#define BOOST_TTI_DETAIL_TRAIT_MEMBER_TYPE(trait,name) \
- template<class T> \
+ template<class BOOST_TTI_DETAIL_TP_T> \
struct BOOST_PP_CAT(trait,_detail_member_type) \
{ \
- typedef typename T::name type; \
+ typedef typename BOOST_TTI_DETAIL_TP_T::name type; \
}; \
/**/
Modified: trunk/boost/tti/detail/dmetafunc.hpp
==============================================================================
--- trunk/boost/tti/detail/dmetafunc.hpp (original)
+++ trunk/boost/tti/detail/dmetafunc.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2012
+// (C) Copyright Edward Diener 2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -17,9 +17,9 @@
namespace detail
{
BOOST_MPL_HAS_XXX_TEMPLATE_NAMED_DEF(is_metafunction_class_apply, apply, false)
- template <class TTI_T>
+ template <class BOOST_TTI_DETAIL_TP_T>
struct is_metafunction_class :
- BOOST_TTI_NAMESPACE::detail::is_metafunction_class_apply<TTI_T>
+ BOOST_TTI_NAMESPACE::detail::is_metafunction_class_apply<BOOST_TTI_DETAIL_TP_T>
{
};
}
Modified: trunk/boost/tti/detail/dplaceholder.hpp
==============================================================================
--- trunk/boost/tti/detail/dplaceholder.hpp (original)
+++ trunk/boost/tti/detail/dplaceholder.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2012
+// (C) Copyright Edward Diener 2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -17,14 +17,14 @@
{
namespace detail
{
- template <class TTI_T>
+ template <class BOOST_TTI_DETAIL_TP_T>
struct is_placeholder_expression :
boost::mpl::not_
<
boost::is_same
<
- typename boost::mpl::lambda<TTI_T>::type,
- TTI_T
+ typename boost::mpl::lambda<BOOST_TTI_DETAIL_TP_T>::type,
+ BOOST_TTI_DETAIL_TP_T
>
>
{
Modified: trunk/boost/tti/detail/dptmf.hpp
==============================================================================
--- trunk/boost/tti/detail/dptmf.hpp (original)
+++ trunk/boost/tti/detail/dptmf.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -19,10 +19,10 @@
{
template
<
- class T,
- class R,
- class FS,
- class TAG
+ class BOOST_TTI_DETAIL_TP_T,
+ class BOOST_TTI_DETAIL_TP_R,
+ class BOOST_TTI_DETAIL_TP_FS,
+ class BOOST_TTI_DETAIL_TP_TAG
>
struct ptmf_seq
{
@@ -33,10 +33,10 @@
boost::mpl::push_front
<
typename
- boost::mpl::push_front<FS,T>::type,
- R
+ boost::mpl::push_front<BOOST_TTI_DETAIL_TP_FS,BOOST_TTI_DETAIL_TP_T>::type,
+ BOOST_TTI_DETAIL_TP_R
>::type,
- TAG
+ BOOST_TTI_DETAIL_TP_TAG
>::type type;
};
}
Modified: trunk/boost/tti/detail/dstatic_mem_data.hpp
==============================================================================
--- trunk/boost/tti/detail/dstatic_mem_data.hpp (original)
+++ trunk/boost/tti/detail/dstatic_mem_data.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -17,44 +17,44 @@
#if defined(BOOST_MSVC)
#define BOOST_TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
- template<class T,class Type> \
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_TYPE> \
struct BOOST_PP_CAT(trait,_detail_hsd) \
{ \
- template<bool,typename U> \
+ template<bool,typename BOOST_TTI_DETAIL_TP_U> \
struct menable_if; \
\
- template<typename U> \
- struct menable_if<true,U> \
+ template<typename BOOST_TTI_DETAIL_TP_U> \
+ struct menable_if<true,BOOST_TTI_DETAIL_TP_U> \
{ \
- typedef U type; \
+ typedef BOOST_TTI_DETAIL_TP_U type; \
}; \
\
- template<typename U,typename V> \
- static ::boost::type_traits::yes_type check2(V *); \
+ template<typename BOOST_TTI_DETAIL_TP_U,typename BOOST_TTI_DETAIL_TP_V> \
+ static ::boost::type_traits::yes_type check2(BOOST_TTI_DETAIL_TP_V *); \
\
- template<typename U,typename V> \
- static ::boost::type_traits::no_type check2(U); \
+ template<typename BOOST_TTI_DETAIL_TP_U,typename BOOST_TTI_DETAIL_TP_V> \
+ static ::boost::type_traits::no_type check2(BOOST_TTI_DETAIL_TP_U); \
\
- template<typename U,typename V> \
+ template<typename BOOST_TTI_DETAIL_TP_U,typename BOOST_TTI_DETAIL_TP_V> \
static typename \
menable_if \
< \
- sizeof(check2<U,V>(&U::name))==sizeof(::boost::type_traits::yes_type), \
+ sizeof(check2<BOOST_TTI_DETAIL_TP_U,BOOST_TTI_DETAIL_TP_V>(&BOOST_TTI_DETAIL_TP_U::name))==sizeof(::boost::type_traits::yes_type), \
::boost::type_traits::yes_type \
> \
::type \
has_matching_member(int); \
\
- template<typename U,typename V> \
+ template<typename BOOST_TTI_DETAIL_TP_U,typename BOOST_TTI_DETAIL_TP_V> \
static ::boost::type_traits::no_type has_matching_member(...); \
\
- template<class U,class V> \
+ template<class BOOST_TTI_DETAIL_TP_U,class BOOST_TTI_DETAIL_TP_V> \
struct ttc_sd \
{ \
- typedef boost::mpl::bool_<sizeof(has_matching_member<V,U>(0))==sizeof(::boost::type_traits::yes_type)> type; \
+ typedef boost::mpl::bool_<sizeof(has_matching_member<BOOST_TTI_DETAIL_TP_V,BOOST_TTI_DETAIL_TP_U>(0))==sizeof(::boost::type_traits::yes_type)> type; \
}; \
\
- typedef typename ttc_sd<Type,T>::type type; \
+ typedef typename ttc_sd<BOOST_TTI_DETAIL_TP_TYPE,BOOST_TTI_DETAIL_TP_T>::type type; \
\
BOOST_STATIC_CONSTANT(bool,value=type::value); \
}; \
@@ -63,19 +63,19 @@
#else // !defined(BOOST_MSVC)
#define BOOST_TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
- template<class T,class Type> \
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_TYPE> \
struct BOOST_PP_CAT(trait,_detail_hsd) \
{ \
- template<Type *> \
+ template<BOOST_TTI_DETAIL_TP_TYPE *> \
struct helper; \
\
- template<class U> \
- static ::boost::type_traits::yes_type chkt(helper<&U::name> *); \
+ template<class BOOST_TTI_DETAIL_TP_U> \
+ static ::boost::type_traits::yes_type chkt(helper<&BOOST_TTI_DETAIL_TP_U::name> *); \
\
- template<class U> \
+ template<class BOOST_TTI_DETAIL_TP_U> \
static ::boost::type_traits::no_type chkt(...); \
\
- BOOST_STATIC_CONSTANT(bool,value=(!boost::function_types::is_function<Type>::value) && (sizeof(chkt<T>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type))); \
+ BOOST_STATIC_CONSTANT(bool,value=(!boost::function_types::is_function<BOOST_TTI_DETAIL_TP_TYPE>::value) && (sizeof(chkt<BOOST_TTI_DETAIL_TP_T>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type))); \
\
typedef boost::mpl::bool_<value> type; \
}; \
Modified: trunk/boost/tti/detail/dstatic_mem_fun.hpp
==============================================================================
--- trunk/boost/tti/detail/dstatic_mem_fun.hpp (original)
+++ trunk/boost/tti/detail/dstatic_mem_fun.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -23,19 +23,19 @@
#include <boost/type_traits/is_same.hpp>
#define BOOST_TTI_DETAIL_TRAIT_IMPL_HAS_STATIC_MEMBER_FUNCTION(trait,name) \
- template<class T,class Type> \
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_TYPE> \
struct BOOST_PP_CAT(trait,_detail_ihsmf) \
{ \
- template<Type *> \
+ template<BOOST_TTI_DETAIL_TP_TYPE *> \
struct helper; \
\
- template<class U> \
- static ::boost::type_traits::yes_type chkt(helper<&U::name> *); \
+ template<class BOOST_TTI_DETAIL_TP_U> \
+ static ::boost::type_traits::yes_type chkt(helper<&BOOST_TTI_DETAIL_TP_U::name> *); \
\
- template<class U> \
+ template<class BOOST_TTI_DETAIL_TP_U> \
static ::boost::type_traits::no_type chkt(...); \
\
- BOOST_STATIC_CONSTANT(bool,value=sizeof(chkt<T>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type)); \
+ BOOST_STATIC_CONSTANT(bool,value=sizeof(chkt<BOOST_TTI_DETAIL_TP_T>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type)); \
\
typedef boost::mpl::bool_<value> type; \
}; \
@@ -43,22 +43,22 @@
#define BOOST_TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_FUNCTION(trait,name) \
BOOST_TTI_DETAIL_TRAIT_IMPL_HAS_STATIC_MEMBER_FUNCTION(trait,name) \
- template<class TTI_T,class TTI_R,class TTI_FS,class TTI_TAG> \
+ template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_R,class BOOST_TTI_DETAIL_TP_FS,class BOOST_TTI_DETAIL_TP_TAG> \
struct BOOST_PP_CAT(trait,_detail_hsmf) : \
BOOST_PP_CAT(trait,_detail_ihsmf) \
< \
- TTI_T, \
+ BOOST_TTI_DETAIL_TP_T, \
typename \
boost::mpl::eval_if \
< \
boost::mpl::and_ \
< \
- boost::function_types::is_function<TTI_R>, \
- boost::is_same<TTI_FS,boost::mpl::vector<> >, \
- boost::is_same<TTI_TAG,boost::function_types::null_tag> \
+ boost::function_types::is_function<BOOST_TTI_DETAIL_TP_R>, \
+ boost::is_same<BOOST_TTI_DETAIL_TP_FS,boost::mpl::vector<> >, \
+ boost::is_same<BOOST_TTI_DETAIL_TP_TAG,boost::function_types::null_tag> \
>, \
- boost::mpl::identity<TTI_R>, \
- BOOST_TTI_NAMESPACE::detail::tfunction_seq<TTI_R,TTI_FS,TTI_TAG> \
+ boost::mpl::identity<BOOST_TTI_DETAIL_TP_R>, \
+ BOOST_TTI_NAMESPACE::detail::tfunction_seq<BOOST_TTI_DETAIL_TP_R,BOOST_TTI_DETAIL_TP_FS,BOOST_TTI_DETAIL_TP_TAG> \
>::type \
> \
{ \
Modified: trunk/boost/tti/detail/dtclass.hpp
==============================================================================
--- trunk/boost/tti/detail/dtclass.hpp (original)
+++ trunk/boost/tti/detail/dtclass.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -17,13 +17,13 @@
{
namespace detail
{
- template <class T>
+ template <class BOOST_TTI_DETAIL_TP_T>
struct tclass :
boost::mpl::eval_if
<
- boost::is_class<T>,
- T,
- boost::mpl::identity<T>
+ boost::is_class<BOOST_TTI_DETAIL_TP_T>,
+ BOOST_TTI_DETAIL_TP_T,
+ boost::mpl::identity<BOOST_TTI_DETAIL_TP_T>
>
{
};
Modified: trunk/boost/tti/detail/dtemplate.hpp
==============================================================================
--- trunk/boost/tti/detail/dtemplate.hpp (original)
+++ trunk/boost/tti/detail/dtemplate.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -38,9 +38,9 @@
#define BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE(trait,name,params) \
BOOST_MPL_HAS_XXX_TEMPLATE_NAMED_DEF(BOOST_PP_CAT(trait,_detail_mpl), name, false) \
- template<class TTI_T> \
+ template<class BOOST_TTI_DETAIL_TP_T> \
struct trait : \
- BOOST_PP_CAT(trait,_detail_mpl)<TTI_T> \
+ BOOST_PP_CAT(trait,_detail_mpl)<BOOST_TTI_DETAIL_TP_T> \
{ \
}; \
/**/
Modified: trunk/boost/tti/detail/dtemplate_params.hpp
==============================================================================
--- trunk/boost/tti/detail/dtemplate_params.hpp (original)
+++ trunk/boost/tti/detail/dtemplate_params.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -29,8 +29,8 @@
#define BOOST_TTI_DETAIL_HAS_MEMBER_IMPLEMENTATION(args,introspect_macro) \
template \
< \
- typename T, \
- typename fallback_ \
+ typename BOOST_TTI_DETAIL_TP_T, \
+ typename BOOST_TTI_DETAIL_TP_FALLBACK_ \
= boost::mpl::bool_< BOOST_PP_ARRAY_ELEM(3, args) > \
> \
class BOOST_PP_ARRAY_ELEM(0, args) \
@@ -38,10 +38,10 @@
introspect_macro(args) \
public: \
static const bool value \
- = BOOST_MPL_HAS_MEMBER_INTROSPECTION_NAME(args)< T >::value; \
+ = BOOST_MPL_HAS_MEMBER_INTROSPECTION_NAME(args)< BOOST_TTI_DETAIL_TP_T >::value; \
typedef typename BOOST_MPL_HAS_MEMBER_INTROSPECTION_NAME(args) \
< \
- T \
+ BOOST_TTI_DETAIL_TP_T \
>::type type; \
}; \
/**/
@@ -64,7 +64,7 @@
args \
) \
> \
- class V \
+ class BOOST_TTI_DETAIL_TM_V \
> \
struct BOOST_MPL_HAS_MEMBER_INTROSPECTION_SUBSTITUTE_NAME(args, n) \
{ \
@@ -121,7 +121,7 @@
args \
) \
> \
- class U \
+ class BOOST_TTI_DETAIL_TM_U \
> \
struct BOOST_MPL_HAS_MEMBER_INTROSPECTION_SUBSTITUTE_NAME_WITH_TEMPLATE_SFINAE \
( \
@@ -149,9 +149,9 @@
#define BOOST_TTI_DETAIL_HAS_MEMBER_INTROSPECT_WITH_TEMPLATE_SFINAE(args) \
BOOST_MPL_HAS_MEMBER_REJECT_WITH_TEMPLATE_SFINAE(args,BOOST_PP_NIL) \
BOOST_MPL_HAS_MEMBER_ACCEPT_WITH_TEMPLATE_SFINAE(args,BOOST_PP_NIL) \
- template< typename U > \
+ template< typename BOOST_TTI_DETAIL_TP_U > \
struct BOOST_MPL_HAS_MEMBER_INTROSPECTION_NAME(args) \
- : BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)< U > { \
+ : BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)< BOOST_TTI_DETAIL_TP_U > { \
}; \
/**/
@@ -188,9 +188,9 @@
#define BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpArray) \
BOOST_TTI_DETAIL_TRAIT_CALL_HAS_TEMPLATE_CHECK_PARAMS(BOOST_PP_CAT(trait,_detail),name,tpArray) \
- template<class TTI_T> \
+ template<class BOOST_TTI_DETAIL_TP_T> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<TTI_T> \
+ BOOST_PP_CAT(trait,_detail)<BOOST_TTI_DETAIL_TP_T> \
{ \
}; \
/**/
Modified: trunk/boost/tti/detail/dtfunction.hpp
==============================================================================
--- trunk/boost/tti/detail/dtfunction.hpp (original)
+++ trunk/boost/tti/detail/dtfunction.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -19,14 +19,14 @@
{
template
<
- class R,
- class FS,
- class TAG
+ class BOOST_TTI_DETAIL_TP_R,
+ class BOOST_TTI_DETAIL_TP_FS,
+ class BOOST_TTI_DETAIL_TP_TAG
>
struct tfunction_seq
{
- typedef typename boost::mpl::push_front<FS,R>::type ftseq;
- typedef typename boost::function_types::function_type<ftseq,TAG>::type type;
+ typedef typename boost::mpl::push_front<BOOST_TTI_DETAIL_TP_FS,BOOST_TTI_DETAIL_TP_R>::type ftseq;
+ typedef typename boost::function_types::function_type<ftseq,BOOST_TTI_DETAIL_TP_TAG>::type type;
};
}
}
Modified: trunk/boost/tti/detail/dtype.hpp
==============================================================================
--- trunk/boost/tti/detail/dtype.hpp (original)
+++ trunk/boost/tti/detail/dtype.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -17,9 +17,9 @@
#include <boost/tti/gen/namespace_gen.hpp>
#define BOOST_TTI_DETAIL_TRAIT_INVOKE_HAS_TYPE(trait,name) \
-template<class TTI_T,class TTI_MFC> \
+template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_MFC> \
struct BOOST_PP_CAT(trait,_detail_type_invoke) : \
- boost::mpl::apply<TTI_MFC,typename TTI_T::name> \
+ boost::mpl::apply<BOOST_TTI_DETAIL_TP_MFC,typename BOOST_TTI_DETAIL_TP_T::name> \
{ \
}; \
/**/
@@ -27,23 +27,23 @@
#define BOOST_TTI_DETAIL_TRAIT_HAS_TYPE(trait,name) \
BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(BOOST_PP_CAT(trait,_detail_type_mpl), name, false) \
BOOST_TTI_DETAIL_TRAIT_INVOKE_HAS_TYPE(trait,name) \
-template<class TTI_T,class TTI_U,class TTI_B> \
+template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_U,class BOOST_TTI_DETAIL_TP_B> \
struct BOOST_PP_CAT(trait,_detail_type) \
{ \
- BOOST_MPL_ASSERT((BOOST_TTI_NAMESPACE::detail::is_lambda_expression<TTI_U>)); \
- typedef typename BOOST_PP_CAT(trait,_detail_type_invoke)<TTI_T,TTI_U>::type type; \
+ BOOST_MPL_ASSERT((BOOST_TTI_NAMESPACE::detail::is_lambda_expression<BOOST_TTI_DETAIL_TP_U>)); \
+ typedef typename BOOST_PP_CAT(trait,_detail_type_invoke)<BOOST_TTI_DETAIL_TP_T,BOOST_TTI_DETAIL_TP_U>::type type; \
BOOST_STATIC_CONSTANT(bool,value=type::value); \
}; \
\
-template<class TTI_T,class TTI_U> \
-struct BOOST_PP_CAT(trait,_detail_type)<TTI_T,TTI_U,boost::mpl::false_::type> \
+template<class BOOST_TTI_DETAIL_TP_T,class BOOST_TTI_DETAIL_TP_U> \
+struct BOOST_PP_CAT(trait,_detail_type)<BOOST_TTI_DETAIL_TP_T,BOOST_TTI_DETAIL_TP_U,boost::mpl::false_::type> \
{ \
typedef boost::mpl::false_::type type; \
BOOST_STATIC_CONSTANT(bool,value=type::value); \
}; \
\
-template<class TTI_T> \
-struct BOOST_PP_CAT(trait,_detail_type)<TTI_T,BOOST_TTI_NAMESPACE::detail::deftype,boost::mpl::true_::type> \
+template<class BOOST_TTI_DETAIL_TP_T> \
+struct BOOST_PP_CAT(trait,_detail_type)<BOOST_TTI_DETAIL_TP_T,BOOST_TTI_NAMESPACE::detail::deftype,boost::mpl::true_::type> \
{ \
typedef boost::mpl::true_::type type; \
BOOST_STATIC_CONSTANT(bool,value=type::value); \
Modified: trunk/boost/tti/detail/dvm_template_params.hpp
==============================================================================
--- trunk/boost/tti/detail/dvm_template_params.hpp (original)
+++ trunk/boost/tti/detail/dvm_template_params.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -134,10 +134,10 @@
#define BOOST_TTI_DETAIL_VM_CALL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,...) \
BOOST_TTI_DETAIL_VM_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(BOOST_PP_CAT(trait,_detail),name,__VA_ARGS__) \
- template<class TTI_T> \
+ template<class BOOST_TTI_DETAIL_TP_T> \
struct trait \
{ \
- typedef typename BOOST_PP_CAT(trait,_detail)<TTI_T>::type type; \
+ typedef typename BOOST_PP_CAT(trait,_detail)<BOOST_TTI_DETAIL_TP_T>::type type; \
\
BOOST_STATIC_CONSTANT(bool,value=type::value); \
}; \
Modified: trunk/boost/tti/has_data.hpp
==============================================================================
--- trunk/boost/tti/has_data.hpp (original)
+++ trunk/boost/tti/has_data.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2012
+// (C) Copyright Edward Diener 2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -30,7 +30,7 @@
generates a metafunction called "trait" where 'trait' is the macro parameter.
- template<class TTI_T,class TTI_Type>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_TYPE>
struct trait
{
static const value = unspecified;
@@ -39,9 +39,9 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'
+ BOOST_TTI_TP_T = the enclosing type in which to look for our 'name'
- TTI_Type = The type of the member data or static member.
+ BOOST_TTI_TP_TYPE = The type of the member data or static member.
returns = 'value' is true if the 'name' exists, with the correct data type,
otherwise 'value' is false.
@@ -49,12 +49,12 @@
*/
#define BOOST_TTI_TRAIT_HAS_DATA(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_DATA(trait,name) \
- template<class TTI_T,class TTI_Type> \
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_TYPE> \
struct trait : \
BOOST_PP_CAT(trait,_detail_hd) \
< \
- typename boost::remove_const<TTI_T>::type, \
- TTI_Type \
+ typename boost::remove_const<BOOST_TTI_TP_T>::type, \
+ BOOST_TTI_TP_TYPE \
> \
{ \
}; \
@@ -67,7 +67,7 @@
generates a metafunction called "has_data_name" where 'name' is the macro parameter.
- template<class TTI_T,class TTI_Type>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_TYPE>
struct has_data_name
{
static const value = unspecified;
@@ -76,9 +76,9 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'
+ BOOST_TTI_TP_T = the enclosing type in which to look for our 'name'
- TTI_Type = The type of the member data or static member.
+ BOOST_TTI_TP_TYPE = The type of the member data or static member.
returns = 'value' is true if the 'name' exists, with the correct data type,
otherwise 'value' is false.
Modified: trunk/boost/tti/has_function.hpp
==============================================================================
--- trunk/boost/tti/has_function.hpp (original)
+++ trunk/boost/tti/has_function.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2012
+// (C) Copyright Edward Diener 2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -31,7 +31,7 @@
generates a metafunction called "trait" where 'trait' is the macro parameter.
- template<class TTI_T,class TTI_R,class TTI_FS,class TTI_TAG>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_R,class BOOST_TTI_TP_FS,class BOOST_TTI_TP_TAG>
struct trait
{
static const value = unspecified;
@@ -40,14 +40,14 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'.
+ BOOST_TTI_TP_T = the enclosing type in which to look for our 'name'.
- TTI_R = the return type of the function
+ BOOST_TTI_TP_R = the return type of the function
- TTI_FS = (optional) the parameters of the function as a boost::mpl forward sequence
+ BOOST_TTI_TP_FS = (optional) the parameters of the function as a boost::mpl forward sequence
if function parameters are not empty.
- TTI_TAG = (optional) a boost::function_types tag to apply to the function
+ BOOST_TTI_TP_TAG = (optional) a boost::function_types tag to apply to the function
if the need for a tag exists.
returns = 'value' is true if the 'name' exists,
@@ -57,9 +57,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_FUNCTION(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_FUNCTION(trait,name) \
- template<class TTI_T,class TTI_R,class TTI_FS = boost::mpl::vector<>,class TTI_TAG = boost::function_types::null_tag> \
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_R,class BOOST_TTI_TP_FS = boost::mpl::vector<>,class BOOST_TTI_TP_TAG = boost::function_types::null_tag> \
struct trait : \
- BOOST_PP_CAT(trait,_detail_hf)<TTI_T,TTI_R,TTI_FS,TTI_TAG> \
+ BOOST_PP_CAT(trait,_detail_hf)<BOOST_TTI_TP_T,BOOST_TTI_TP_R,BOOST_TTI_TP_FS,BOOST_TTI_TP_TAG> \
{ \
}; \
/**/
@@ -71,7 +71,7 @@
generates a metafunction called "has_function_name" where 'name' is the macro parameter.
- template<class TTI_T,class TTI_R,class TTI_FS,class TTI_TAG>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_R,class BOOST_TTI_TP_FS,class BOOST_TTI_TP_TAG>
struct trait
{
static const value = unspecified;
@@ -80,14 +80,14 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'.
+ BOOST_TTI_TP_T = the enclosing type in which to look for our 'name'.
- TTI_R = the return type of the function
+ BOOST_TTI_TP_R = the return type of the function
- TTI_FS = (optional) the parameters of the function as a boost::mpl forward sequence
+ BOOST_TTI_TP_FS = (optional) the parameters of the function as a boost::mpl forward sequence
if function parameters are not empty.
- TTI_TAG = (optional) a boost::function_types tag to apply to the function
+ BOOST_TTI_TP_TAG = (optional) a boost::function_types tag to apply to the function
if the need for a tag exists.
returns = 'value' is true if the 'name' exists,
Modified: trunk/boost/tti/has_member_data.hpp
==============================================================================
--- trunk/boost/tti/has_member_data.hpp (original)
+++ trunk/boost/tti/has_member_data.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
Modified: trunk/boost/tti/has_member_function.hpp
==============================================================================
--- trunk/boost/tti/has_member_function.hpp (original)
+++ trunk/boost/tti/has_member_function.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -33,7 +33,7 @@
generates a metafunction called "trait" where 'trait' is the macro parameter.<br />
- template<class TTI_T,class TTI_R,class TTI_FS,class TTI_TAG>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_R,class BOOST_TTI_FS,class BOOST_TTI_TAG>
struct trait
{
static const value = unspecified;
@@ -42,18 +42,18 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'
+ BOOST_TTI_TP_T = the enclosing type in which to look for our 'name'
OR
a pointer to member function as a single type.
- TTI_R = (optional) the return type of the member function
+ BOOST_TTI_TP_R = (optional) the return type of the member function
if the first parameter is the enclosing type.
- TTI_FS = (optional) the parameters of the member function as a boost::mpl forward sequence
+ BOOST_TTI_TP_FS = (optional) the parameters of the member function as a boost::mpl forward sequence
if the first parameter is the enclosing type and the member function parameters
are not empty.
- TTI_TAG = (optional) a boost::function_types tag to apply to the member function
+ BOOST_TTI_TP_TAG = (optional) a boost::function_types tag to apply to the member function
if the first parameter is the enclosing type and a tag is needed.
returns = 'value' is true if the 'name' exists,
@@ -63,9 +63,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_MEMBER_FUNCTION(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_MEMBER_FUNCTION(trait,name) \
- template<class TTI_T,class TTI_R = BOOST_TTI_NAMESPACE::detail::deftype,class TTI_FS = boost::mpl::vector<>,class TTI_TAG = boost::function_types::null_tag> \
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_R = BOOST_TTI_NAMESPACE::detail::deftype,class BOOST_TTI_TP_FS = boost::mpl::vector<>,class BOOST_TTI_TP_TAG = boost::function_types::null_tag> \
struct trait : \
- BOOST_PP_CAT(trait,_detail_hmf)<TTI_T,TTI_R,TTI_FS,TTI_TAG> \
+ BOOST_PP_CAT(trait,_detail_hmf)<BOOST_TTI_TP_T,BOOST_TTI_TP_R,BOOST_TTI_TP_FS,BOOST_TTI_TP_TAG> \
{ \
}; \
/**/
@@ -77,7 +77,7 @@
generates a metafunction called "has_member_function_name" where 'name' is the macro parameter.
- template<class TTI_T,class TTI_R,class TTI_FS,class TTI_TAG>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_R,class BOOST_TTI_TP_FS,class BOOST_TTI_TP_TAG>
struct has_member_function_name
{
static const value = unspecified;
@@ -86,18 +86,18 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'
+ BOOST_TTI_TP_T = the enclosing type in which to look for our 'name'
OR
a pointer to member function as a single type.
- TTI_R = (optional) the return type of the member function
+ BOOST_TTI_TP_R = (optional) the return type of the member function
if the first parameter is the enclosing type.
- TTI_FS = (optional) the parameters of the member function as a boost::mpl forward sequence
+ BOOST_TTI_TP_FS = (optional) the parameters of the member function as a boost::mpl forward sequence
if the first parameter is the enclosing type and the member function parameters
are not empty.
- TTI_TAG = (optional) a boost::function_types tag to apply to the member function
+ BOOST_TTI_TP_TAG = (optional) a boost::function_types tag to apply to the member function
if the first parameter is the enclosing type and a tag is needed.
returns = 'value' is true if the 'name' exists,
Modified: trunk/boost/tti/has_static_member_data.hpp
==============================================================================
--- trunk/boost/tti/has_static_member_data.hpp (original)
+++ trunk/boost/tti/has_static_member_data.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -32,23 +32,23 @@
The metafunction types and return:
- TTI_T = the enclosing type.
+ BOOST_TTI_TP_T = the enclosing type.
- TTI_Type = the static member data type,
+ BOOST_TTI_TP_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,
- with the TTI_Type type,
- within the enclosing TTI_T type,
+ with the BOOST_TTI_TP_TYPE type,
+ within the enclosing BOOST_TTI_TP_T type,
otherwise 'value' is false.
*/
#define BOOST_TTI_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
- template<class TTI_T,class TTI_Type> \
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_TYPE> \
struct trait : \
- BOOST_PP_CAT(trait,_detail_hsd)<TTI_T,TTI_Type> \
+ BOOST_PP_CAT(trait,_detail_hsd)<BOOST_TTI_TP_T,BOOST_TTI_TP_TYPE> \
{ \
}; \
/**/
@@ -62,15 +62,15 @@
The metafunction types and return:
- TTI_T = the enclosing type.
+ BOOST_TTI_TP_T = the enclosing type.
- TTI_Type = the static member data type,
+ BOOST_TTI_TP_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,
- with the appropriate TTI_Type type,
- within the enclosing TTI_T type,
+ with the appropriate BOOST_TTI_TP_TYPE type,
+ within the enclosing BOOST_TTI_TP_T type,
otherwise 'value' is false.
*/
Modified: trunk/boost/tti/has_static_member_function.hpp
==============================================================================
--- trunk/boost/tti/has_static_member_function.hpp (original)
+++ trunk/boost/tti/has_static_member_function.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -31,7 +31,7 @@
generates a metafunction called "trait" where 'trait' is the macro parameter.
- template<class TTI_T,class TTI_R,class TTI_FS,class TTI_TAG>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_R,class BOOST_TTI_TP_FS,class BOOST_TTI_TP_TAG>
struct trait
{
static const value = unspecified;
@@ -40,16 +40,16 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'.
+ BOOST_TTI_TP_T = the enclosing type in which to look for our 'name'.
- TTI_R = the return type of the static member function
+ BOOST_TTI_TP_R = the return type of the static member function
OR
the signature of a function in the form of Return_Type ( Parameter_Types )
- TTI_FS = (optional) the parameters of the static member function as a boost::mpl forward sequence
+ BOOST_TTI_TP_FS = (optional) the parameters of the static member function as a boost::mpl forward sequence
if the second parameter is a return type and the function parameters exist.
- TTI_TAG = (optional) a boost::function_types tag to apply to the static member function
+ BOOST_TTI_TP_TAG = (optional) a boost::function_types tag to apply to the static member function
if the second parameter is a return type and the need for a tag exists.
returns = 'value' is true if the 'name' exists,
@@ -59,9 +59,9 @@
*/
#define BOOST_TTI_TRAIT_HAS_STATIC_MEMBER_FUNCTION(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_FUNCTION(trait,name) \
- template<class TTI_T,class TTI_R,class TTI_FS = boost::mpl::vector<>,class TTI_TAG = boost::function_types::null_tag> \
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_R,class BOOST_TTI_TP_FS = boost::mpl::vector<>,class BOOST_TTI_TP_TAG = boost::function_types::null_tag> \
struct trait : \
- BOOST_PP_CAT(trait,_detail_hsmf)<TTI_T,TTI_R,TTI_FS,TTI_TAG> \
+ BOOST_PP_CAT(trait,_detail_hsmf)<BOOST_TTI_TP_T,BOOST_TTI_TP_R,BOOST_TTI_TP_FS,BOOST_TTI_TP_TAG> \
{ \
}; \
/**/
@@ -73,7 +73,7 @@
generates a metafunction called "has_static_member_function_name" where 'name' is the macro parameter.
- template<class TTI_T,class TTI_R,class TTI_FS,class TTI_TAG>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_R,class BOOST_TTI_TP_FS,class BOOST_TTI_TP_TAG>
struct trait
{
static const value = unspecified;
@@ -82,16 +82,16 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'.
+ BOOST_TTI_TP_T = the enclosing type in which to look for our 'name'.
- TTI_R = the return type of the static member function
+ BOOST_TTI_TP_R = the return type of the static member function
OR
the signature of a function in the form of Return_Type ( Parameter_Types )
- TTI_FS = (optional) the parameters of the static member function as a boost::mpl forward sequence
+ BOOST_TTI_TP_FS = (optional) the parameters of the static member function as a boost::mpl forward sequence
if the second parameter is a return type and the function parameters exist.
- TTI_TAG = (optional) a boost::function_types tag to apply to the static member function
+ BOOST_TTI_TP_TAG = (optional) a boost::function_types tag to apply to the static member function
if the second parameter is a return type and the need for a tag exists.
returns = 'value' is true if the 'name' exists,
Modified: trunk/boost/tti/has_template.hpp
==============================================================================
--- trunk/boost/tti/has_template.hpp (original)
+++ trunk/boost/tti/has_template.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -61,7 +61,7 @@
generates a metafunction called "trait" where 'trait' is the first macro parameter.
- template<class TTI_T>
+ template<class BOOST_TTI_TP_T>
struct trait
{
static const value = unspecified;
@@ -70,7 +70,7 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'.
+ BOOST_TTI_TP_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.
@@ -153,7 +153,7 @@
generates a metafunction called "has_template_'name'" where 'name' is the first variadic parameter.
- template<class TTI_T>
+ template<class BOOST_TTI_TP_T>
struct has_template_'name'
{
static const value = unspecified;
@@ -162,7 +162,7 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'.
+ BOOST_TTI_TP_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.
@@ -233,7 +233,7 @@
generates a metafunction called "trait" where 'trait' is the first macro parameter.
- template<class TTI_T>
+ template<class BOOST_TTI_TP_T>
struct trait
{
static const value = unspecified;
@@ -242,7 +242,7 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'.
+ BOOST_TTI_TP_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.
@@ -298,7 +298,7 @@
generates a metafunction called "has_template_'name'" where 'name' is the first macro parameter.
- template<class TTI_T>
+ template<class BOOST_TTI_TP_T>
struct trait
{
static const value = unspecified;
@@ -307,7 +307,7 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'.
+ BOOST_TTI_TP_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/has_type.hpp
==============================================================================
--- trunk/boost/tti/has_type.hpp (original)
+++ trunk/boost/tti/has_type.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -1,5 +1,5 @@
-// (C) Copyright Edward Diener 2011,2012
+// (C) Copyright Edward Diener 2011,2012,2013
// Use, modification and distribution are subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
@@ -36,7 +36,7 @@
generates a metafunction called "trait" where 'trait' is the macro parameter.
- template<class TTI_T,class TTI_U>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_U>
struct trait
{
static const value = unspecified;
@@ -45,25 +45,25 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'.
+ BOOST_TTI_TP_T = the enclosing type in which to look for our 'name'.
- TTI_U = (optional) An optional template parameter, defaulting to a marker type.
+ BOOST_TTI_TP_U = (optional) An optional template parameter, defaulting to a marker type.
If specified it is an MPL lambda expression which is invoked
with the inner type found and must return a constant boolean
value.
- returns = 'value' depends on whether or not the optional TTI_U is specified.
+ returns = 'value' depends on whether or not the optional BOOST_TTI_TP_U is specified.
- If TTI_U is not specified, then 'value' is true if the 'name' type
- exists within the enclosing type TTI_T; otherwise 'value' is false.
+ If BOOST_TTI_TP_U is not specified, then 'value' is true if the 'name' type
+ exists within the enclosing type BOOST_TTI_TP_T; otherwise 'value' is false.
- If TTI_U is specified , then 'value' is true if the 'name' type exists
- within the enclosing type TTI_T and the lambda expression as specified
- by TTI_U, invoked by passing the actual inner type of 'name', returns
+ If BOOST_TTI_TP_U is specified , then 'value' is true if the 'name' type exists
+ within the enclosing type BOOST_TTI_TP_T and the lambda expression as specified
+ by BOOST_TTI_TP_U, invoked by passing the actual inner type of 'name', returns
a 'value' of true; otherwise 'value' is false.
- The action taken with TTI_U occurs only when the 'name' type exists
- within the enclosing type TTI_T.
+ The action taken with BOOST_TTI_TP_U occurs only when the 'name' type exists
+ within the enclosing type BOOST_TTI_TP_T.
Example usage:
@@ -86,15 +86,15 @@
BOOST_TTI_DETAIL_TRAIT_HAS_TYPE(trait,name) \
template \
< \
- class TTI_T, \
- class TTI_U = BOOST_TTI_NAMESPACE::detail::deftype \
+ class BOOST_TTI_TP_T, \
+ class BOOST_TTI_TP_U = BOOST_TTI_NAMESPACE::detail::deftype \
> \
struct trait : \
BOOST_PP_CAT(trait,_detail_type) \
< \
- TTI_T, \
- TTI_U, \
- typename BOOST_PP_CAT(trait,_detail_type_mpl)<TTI_T>::type \
+ BOOST_TTI_TP_T, \
+ BOOST_TTI_TP_U, \
+ typename BOOST_PP_CAT(trait,_detail_type_mpl)<BOOST_TTI_TP_T>::type \
> \
{ \
}; \
@@ -111,7 +111,7 @@
generates a metafunction called "has_type_'name'" where 'name' is the macro parameter.
- template<class TTI_T,class TTI_U>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_U>
struct has_type_'name'
{
static const value = unspecified;
@@ -120,25 +120,25 @@
The metafunction types and return:
- TTI_T = the enclosing type in which to look for our 'name'.
+ BOOST_TTI_TP_T = the enclosing type in which to look for our 'name'.
- TTI_U = (optional) An optional template parameter, defaulting to a marker type.
+ BOOST_TTI_TP_U = (optional) An optional template parameter, defaulting to a marker type.
If specified it is an MPL lambda expression which is invoked
with the inner type found and must return a constant boolean
value.
- returns = 'value' depends on whether or not the optional TTI_U is specified.
+ returns = 'value' depends on whether or not the optional BOOST_TTI_TP_U is specified.
- If TTI_U is not specified, then 'value' is true if the 'name' type
- exists within the enclosing type TTI_T; otherwise 'value' is false.
+ If BOOST_TTI_TP_U is not specified, then 'value' is true if the 'name' type
+ exists within the enclosing type BOOST_TTI_TP_T; otherwise 'value' is false.
- If TTI_U is specified , then 'value' is true if the 'name' type exists
- within the enclosing type TTI_T and the lambda expression as specified
- by TTI_U, invoked by passing the actual inner type of 'name', returns
+ If BOOST_TTI_TP_U is specified , then 'value' is true if the 'name' type exists
+ within the enclosing type BOOST_TTI_TP_T and the lambda expression as specified
+ by BOOST_TTI_TP_U, invoked by passing the actual inner type of 'name', returns
a 'value' of true; otherwise 'value' is false.
- The action taken with TTI_U occurs only when the 'name' type exists
- within the enclosing type TTI_T.
+ The action taken with BOOST_TTI_TP_U occurs only when the 'name' type exists
+ within the enclosing type BOOST_TTI_TP_T.
Example usage:
Modified: trunk/boost/tti/member_type.hpp
==============================================================================
--- trunk/boost/tti/member_type.hpp (original)
+++ trunk/boost/tti/member_type.hpp 2013-05-27 01:56:40 EDT (Mon, 27 May 2013)
@@ -36,18 +36,18 @@
generates a metafunction called "trait" where 'trait' is the macro parameter.
- template<class TTI_T,class TTI_MARKER_TYPE = boost::tti::detail::notype>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_MARKER_TYPE = boost::tti::detail::notype>
struct trait
{
typedef unspecified type;
- typedef TTI_MARKER_TYPE boost_tti_marker_type;
+ typedef BOOST_TTI_TP_MARKER_TYPE boost_tti_marker_type;
};
The metafunction types and return:
- TTI_T = the enclosing type.
- TTI_MARKER_TYPE = (optional) a type to use as the marker type.
+ BOOST_TTI_TP_T = the enclosing type.
+ BOOST_TTI_TP_MARKER_TYPE = (optional) a type to use as the marker type.
defaults to the internal boost::tti::detail::notype.
returns = 'type' is the inner type of 'name' if the inner type exists
@@ -67,16 +67,16 @@
#define BOOST_TTI_TRAIT_MEMBER_TYPE(trait,name) \
BOOST_TTI_DETAIL_TRAIT_HAS_TYPE_MEMBER_TYPE(trait,name) \
BOOST_TTI_DETAIL_TRAIT_MEMBER_TYPE(trait,name) \
- template<class TTI_T,class TTI_MARKER_TYPE = BOOST_TTI_NAMESPACE::detail::notype> \
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_MARKER_TYPE = BOOST_TTI_NAMESPACE::detail::notype> \
struct trait : \
boost::mpl::eval_if \
< \
- BOOST_PP_CAT(trait,_detail)<TTI_T>, \
- BOOST_PP_CAT(trait,_detail_member_type)<TTI_T>, \
- boost::mpl::identity<TTI_MARKER_TYPE> \
+ BOOST_PP_CAT(trait,_detail)<BOOST_TTI_TP_T>, \
+ BOOST_PP_CAT(trait,_detail_member_type)<BOOST_TTI_TP_T>, \
+ boost::mpl::identity<BOOST_TTI_TP_MARKER_TYPE> \
> \
{ \
- typedef TTI_MARKER_TYPE boost_tti_marker_type; \
+ typedef BOOST_TTI_TP_MARKER_TYPE boost_tti_marker_type; \
}; \
/**/
@@ -87,18 +87,18 @@
generates a metafunction called "member_type_name" where 'name' is the macro parameter.
- template<class TTI_T,class TTI_MARKER_TYPE = boost::tti::detail::notype>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_MARKER_TYPE = boost::tti::detail::notype>
struct member_type_name
{
typedef unspecified type;
- typedef TTI_MARKER_TYPE boost_tti_marker_type;
+ typedef BOOST_TTI_TP_MARKER_TYPE boost_tti_marker_type;
};
The metafunction types and return:
- TTI_T = the enclosing type.
- TTI_MARKER_TYPE = (optional) a type to use as the marker type.
+ BOOST_TTI_TP_T = the enclosing type.
+ BOOST_TTI_TP_MARKER_TYPE = (optional) a type to use as the marker type.
defaults to the internal boost::tti::detail::notype.
returns = 'type' is the inner type of 'name' if the inner type exists
@@ -131,7 +131,7 @@
/// A metafunction which checks whether the member 'type' returned from invoking the macro metafunction generated by BOOST_TTI_MEMBER_TYPE ( BOOST_TTI_TRAIT_MEMBER_TYPE ) is a valid type.
/**
- template<class TTI_T,class TTI_MARKER_TYPE = boost::tti::detail::notype>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_MARKER_TYPE = boost::tti::detail::notype>
struct valid_member_type
{
static const value = unspecified;
@@ -140,19 +140,19 @@
The metafunction types and return:
- TTI_T = returned inner 'type' from invoking the macro metafunction generated by BOOST_TTI_MEMBER_TYPE ( BOOST_TTI_TRAIT_MEMBER_TYPE ).
- TTI_MARKER_TYPE = (optional) a type to use as the marker type.
+ BOOST_TTI_TP_T = returned inner 'type' from invoking the macro metafunction generated by BOOST_TTI_MEMBER_TYPE ( BOOST_TTI_TRAIT_MEMBER_TYPE ).
+ BOOST_TTI_TP_MARKER_TYPE = (optional) a type to use as the marker type.
defaults to the internal boost::tti::detail::notype.
returns = 'value' is true if the type is valid, otherwise 'value' is false.
A valid type means that the returned inner 'type' is not the marker type.
*/
- template<class TTI_T,class TTI_MARKER_TYPE = BOOST_TTI_NAMESPACE::detail::notype>
+ template<class BOOST_TTI_TP_T,class BOOST_TTI_TP_MARKER_TYPE = BOOST_TTI_NAMESPACE::detail::notype>
struct valid_member_type :
boost::mpl::not_
<
- boost::is_same<TTI_T,TTI_MARKER_TYPE>
+ boost::is_same<BOOST_TTI_TP_T,BOOST_TTI_TP_MARKER_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