From b72cb8fd3967e11f3390cb232ccd935266cb8fa9 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Mon, 5 Nov 2012 03:28:42 +0000 Subject: [PATCH] Updated all macro template names to start with BOOST_TTI_. [SVN r81185] --- include/boost/tti/detail/dtemplate.hpp | 24 +++---- include/boost/tti/detail/dtemplate_params.hpp | 72 +++++++++---------- .../boost/tti/detail/dvm_template_params.hpp | 58 +++++++-------- include/boost/tti/has_template.hpp | 14 ++-- .../boost/tti/has_template_check_params.hpp | 8 +-- .../tti/vm_has_template_check_params.hpp | 8 +-- 6 files changed, 92 insertions(+), 92 deletions(-) diff --git a/include/boost/tti/detail/dtemplate.hpp b/include/boost/tti/detail/dtemplate.hpp index 25c78a9..d807a19 100644 --- a/include/boost/tti/detail/dtemplate.hpp +++ b/include/boost/tti/detail/dtemplate.hpp @@ -4,8 +4,8 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt). -#if !defined(TTI_DETAIL_TEMPLATE_HPP) -#define TTI_DETAIL_TEMPLATE_HPP +#if !defined(BOOST_TTI_DETAIL_TEMPLATE_HPP) +#define BOOST_TTI_DETAIL_TEMPLATE_HPP #if !defined(BOOST_TTI_VERSION_1_5) @@ -15,30 +15,30 @@ #include #include -#define TTI_DETAIL_IS_HELPER_BOOST_PP_NIL +#define BOOST_TTI_DETAIL_IS_HELPER_BOOST_PP_NIL -#define TTI_DETAIL_IS_NIL(param) \ +#define BOOST_TTI_DETAIL_IS_NIL(param) \ BOOST_PP_IS_EMPTY \ ( \ - BOOST_PP_CAT(TTI_DETAIL_IS_HELPER_,param) \ + BOOST_PP_CAT(BOOST_TTI_DETAIL_IS_HELPER_,param) \ ) \ /**/ -#define TTI_DETAIL_TRAIT_ASSERT_NOT_NIL(trait,name,params) \ +#define BOOST_TTI_DETAIL_TRAIT_ASSERT_NOT_NIL(trait,name,params) \ BOOST_PP_ASSERT_MSG(0, "The parameter must be BOOST_PP_NIL") \ /**/ -#define TTI_DETAIL_TRAIT_CHECK_IS_NIL(trait,name,params) \ +#define BOOST_TTI_DETAIL_TRAIT_CHECK_IS_NIL(trait,name,params) \ BOOST_PP_IIF \ ( \ - TTI_DETAIL_IS_NIL(params), \ - TTI_DETAIL_TRAIT_HAS_TEMPLATE, \ - TTI_DETAIL_TRAIT_ASSERT_NOT_NIL \ + BOOST_TTI_DETAIL_IS_NIL(params), \ + BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE, \ + BOOST_TTI_DETAIL_TRAIT_ASSERT_NOT_NIL \ ) \ (trait,name,params) \ /**/ -#define TTI_DETAIL_TRAIT_HAS_TEMPLATE(trait,name,params) \ +#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 \ struct trait : \ @@ -48,4 +48,4 @@ /**/ #endif // !BOOST_TTI_VERSION_1_5 -#endif // !TTI_DETAIL_TEMPLATE_HPP +#endif // !BOOST_TTI_DETAIL_TEMPLATE_HPP diff --git a/include/boost/tti/detail/dtemplate_params.hpp b/include/boost/tti/detail/dtemplate_params.hpp index 2c6e7e8..abe27fa 100644 --- a/include/boost/tti/detail/dtemplate_params.hpp +++ b/include/boost/tti/detail/dtemplate_params.hpp @@ -4,8 +4,8 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt). -#if !defined(TTI_DETAIL_TEMPLATE_PARAMS_HPP) -#define TTI_DETAIL_TEMPLATE_PARAMS_HPP +#if !defined(BOOST_TTI_DETAIL_TEMPLATE_PARAMS_HPP) +#define BOOST_TTI_DETAIL_TEMPLATE_PARAMS_HPP #include #include @@ -32,11 +32,11 @@ #if !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE) -#define TTI_DETAIL_TEMPLATE_PARAMETERS(z,n,args) \ +#define BOOST_TTI_DETAIL_TEMPLATE_PARAMETERS(z,n,args) \ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ /**/ -#define TTI_DETAIL_HAS_MEMBER_IMPLEMENTATION(args,introspect_macro) \ +#define BOOST_TTI_DETAIL_HAS_MEMBER_IMPLEMENTATION(args,introspect_macro) \ template \ < \ typename T, \ @@ -58,7 +58,7 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1400) -#define TTI_DETAIL_HAS_MEMBER_MULTI_SUBSTITUTE(z,n,args) \ +#define BOOST_TTI_DETAIL_HAS_MEMBER_MULTI_SUBSTITUTE(z,n,args) \ template \ < \ template \ @@ -70,7 +70,7 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ BOOST_PP_ARRAY_SIZE(args), \ 4 \ ), \ - TTI_DETAIL_TEMPLATE_PARAMETERS, \ + BOOST_TTI_DETAIL_TEMPLATE_PARAMETERS, \ args \ ) \ > \ @@ -81,20 +81,20 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ }; \ /**/ -#define TTI_DETAIL_HAS_MEMBER_SUBSTITUTE(args) \ +#define BOOST_TTI_DETAIL_HAS_MEMBER_SUBSTITUTE(args) \ BOOST_PP_REPEAT \ ( \ BOOST_PP_ARRAY_ELEM(2, args), \ - TTI_DETAIL_HAS_MEMBER_MULTI_SUBSTITUTE, \ + BOOST_TTI_DETAIL_HAS_MEMBER_MULTI_SUBSTITUTE, \ args \ ) \ /**/ -#define TTI_DETAIL_HAS_MEMBER_INTROSPECT(args) \ +#define BOOST_TTI_DETAIL_HAS_MEMBER_INTROSPECT(args) \ template< typename U > \ struct BOOST_MPL_HAS_MEMBER_INTROSPECTION_NAME(args) \ { \ - TTI_DETAIL_HAS_MEMBER_SUBSTITUTE(args) \ + BOOST_TTI_DETAIL_HAS_MEMBER_SUBSTITUTE(args) \ BOOST_MPL_HAS_MEMBER_REJECT(args, BOOST_PP_NIL) \ BOOST_MPL_HAS_MEMBER_ACCEPT(args, BOOST_PP_NIL) \ BOOST_STATIC_CONSTANT \ @@ -105,17 +105,17 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ }; \ /**/ -#define TTI_DETAIL_HAS_MEMBER_WITH_FUNCTION_SFINAE(args) \ - TTI_DETAIL_HAS_MEMBER_IMPLEMENTATION \ +#define BOOST_TTI_DETAIL_HAS_MEMBER_WITH_FUNCTION_SFINAE(args) \ + BOOST_TTI_DETAIL_HAS_MEMBER_IMPLEMENTATION \ ( \ args, \ - TTI_DETAIL_HAS_MEMBER_INTROSPECT \ + BOOST_TTI_DETAIL_HAS_MEMBER_INTROSPECT \ ) \ /**/ #else // !!BOOST_WORKAROUND(BOOST_MSVC, <= 1400) -#define TTI_DETAIL_HAS_MEMBER_MULTI_SUBSTITUTE_WITH_TEMPLATE_SFINAE(z,n,args) \ +#define BOOST_TTI_DETAIL_HAS_MEMBER_MULTI_SUBSTITUTE_WITH_TEMPLATE_SFINAE(z,n,args) \ template \ < \ template \ @@ -127,7 +127,7 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ BOOST_PP_ARRAY_SIZE(args), \ 4 \ ), \ - TTI_DETAIL_TEMPLATE_PARAMETERS, \ + BOOST_TTI_DETAIL_TEMPLATE_PARAMETERS, \ args \ ) \ > \ @@ -145,18 +145,18 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ }; \ /**/ -#define TTI_DETAIL_HAS_MEMBER_SUBSTITUTE_WITH_TEMPLATE_SFINAE(args) \ +#define BOOST_TTI_DETAIL_HAS_MEMBER_SUBSTITUTE_WITH_TEMPLATE_SFINAE(args) \ typedef void \ BOOST_MPL_HAS_MEMBER_INTROSPECTION_SUBSTITUTE_TAG_NAME(args); \ BOOST_PP_REPEAT \ ( \ BOOST_PP_ARRAY_ELEM(2, args), \ - TTI_DETAIL_HAS_MEMBER_MULTI_SUBSTITUTE_WITH_TEMPLATE_SFINAE, \ + BOOST_TTI_DETAIL_HAS_MEMBER_MULTI_SUBSTITUTE_WITH_TEMPLATE_SFINAE, \ args \ ) \ /**/ -#define TTI_DETAIL_HAS_MEMBER_INTROSPECT_WITH_TEMPLATE_SFINAE(args) \ +#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 > \ @@ -165,15 +165,15 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ }; \ /**/ -#define TTI_DETAIL_HAS_MEMBER_WITH_TEMPLATE_SFINAE(args) \ - TTI_DETAIL_HAS_MEMBER_SUBSTITUTE_WITH_TEMPLATE_SFINAE \ +#define BOOST_TTI_DETAIL_HAS_MEMBER_WITH_TEMPLATE_SFINAE(args) \ + BOOST_TTI_DETAIL_HAS_MEMBER_SUBSTITUTE_WITH_TEMPLATE_SFINAE \ ( \ args \ ) \ - TTI_DETAIL_HAS_MEMBER_IMPLEMENTATION \ + BOOST_TTI_DETAIL_HAS_MEMBER_IMPLEMENTATION \ ( \ args, \ - TTI_DETAIL_HAS_MEMBER_INTROSPECT_WITH_TEMPLATE_SFINAE \ + BOOST_TTI_DETAIL_HAS_MEMBER_INTROSPECT_WITH_TEMPLATE_SFINAE \ ) \ /**/ @@ -181,7 +181,7 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ #else // defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE) -#define TTI_DETAIL_SAME(trait,name) \ +#define BOOST_TTI_DETAIL_SAME(trait,name) \ BOOST_MPL_HAS_XXX_TEMPLATE_NAMED_DEF \ ( \ trait, \ @@ -190,16 +190,16 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ ) \ /**/ -#define TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tp) \ - TTI_DETAIL_SAME(trait,name) \ +#define BOOST_TTI_DETAIL_TRAIT_CALL_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tp) \ + BOOST_TTI_DETAIL_SAME(trait,name) \ /**/ #endif // !BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE #if !defined(BOOST_TTI_VERSION_1_5) -#define TTI_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpArray) \ - TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(BOOST_PP_CAT(trait,_detail),name,tpArray) \ +#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 \ struct trait : \ BOOST_PP_CAT(trait,_detail) \ @@ -210,8 +210,8 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ #if !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE) #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1400) -#define TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpArray) \ - TTI_DETAIL_HAS_MEMBER_WITH_FUNCTION_SFINAE \ +#define BOOST_TTI_DETAIL_TRAIT_CALL_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpArray) \ + BOOST_TTI_DETAIL_HAS_MEMBER_WITH_FUNCTION_SFINAE \ ( \ ( BOOST_PP_ADD(BOOST_PP_ARRAY_SIZE(tpArray),4), ( trait, name, 1, false, BOOST_PP_ARRAY_ENUM(tpArray) ) ) \ ) \ @@ -219,8 +219,8 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ #else // BOOST_WORKAROUND(BOOST_MSVC, <= 1400) -#define TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpArray) \ - TTI_DETAIL_HAS_MEMBER_WITH_TEMPLATE_SFINAE \ +#define BOOST_TTI_DETAIL_TRAIT_CALL_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpArray) \ + BOOST_TTI_DETAIL_HAS_MEMBER_WITH_TEMPLATE_SFINAE \ ( \ ( BOOST_PP_ADD(BOOST_PP_ARRAY_SIZE(tpArray),4), ( trait, name, 1, false, BOOST_PP_ARRAY_ENUM(tpArray) ) ) \ ) \ @@ -234,8 +234,8 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ #if !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE) #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1400) -#define TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpSeq) \ - TTI_DETAIL_HAS_MEMBER_WITH_FUNCTION_SFINAE \ +#define BOOST_TTI_DETAIL_TRAIT_CALL_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpSeq) \ + BOOST_TTI_DETAIL_HAS_MEMBER_WITH_FUNCTION_SFINAE \ ( \ ( BOOST_PP_ADD(BOOST_PP_SEQ_SIZE(tpSeq),4), ( trait, name, 1, false, BOOST_PP_SEQ_ENUM(tpSeq) ) ) \ ) \ @@ -243,8 +243,8 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ #else // BOOST_WORKAROUND(BOOST_MSVC, <= 1400) -#define TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpSeq) \ - TTI_DETAIL_HAS_MEMBER_WITH_TEMPLATE_SFINAE \ +#define BOOST_TTI_DETAIL_TRAIT_CALL_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpSeq) \ + BOOST_TTI_DETAIL_HAS_MEMBER_WITH_TEMPLATE_SFINAE \ ( \ ( BOOST_PP_ADD(BOOST_PP_SEQ_SIZE(tpSeq),4), ( trait, name, 1, false, BOOST_PP_SEQ_ENUM(tpSeq) ) ) \ ) \ @@ -255,4 +255,4 @@ BOOST_PP_ARRAY_ELEM(BOOST_PP_ADD(4,n),args) \ #endif // !BOOST_TTI_VERSION_1_5 -#endif // TTI_DETAIL_TEMPLATE_PARAMS_HPP +#endif // BOOST_TTI_DETAIL_TEMPLATE_PARAMS_HPP diff --git a/include/boost/tti/detail/dvm_template_params.hpp b/include/boost/tti/detail/dvm_template_params.hpp index dccb872..fd9a8fa 100644 --- a/include/boost/tti/detail/dvm_template_params.hpp +++ b/include/boost/tti/detail/dvm_template_params.hpp @@ -4,8 +4,8 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt). -#if !defined(TTI_VM_DETAIL_TEMPLATE_PARAMS_HPP) -#define TTI_VM_DETAIL_TEMPLATE_PARAMS_HPP +#if !defined(BOOST_TTI_DETAIL_VM_TEMPLATE_PARAMS_HPP) +#define BOOST_TTI_DETAIL_VM_TEMPLATE_PARAMS_HPP #include #include @@ -36,8 +36,8 @@ #if !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE) #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1400) -#define TTI_VM_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,...) \ - TTI_DETAIL_HAS_MEMBER_WITH_FUNCTION_SFINAE \ +#define BOOST_TTI_DETAIL_VM_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,...) \ + BOOST_TTI_DETAIL_HAS_MEMBER_WITH_FUNCTION_SFINAE \ ( \ ( BOOST_PP_ADD(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),4), ( trait, name, 1, false, __VA_ARGS__ ) ) \ ) \ @@ -45,8 +45,8 @@ #else // !!BOOST_WORKAROUND(BOOST_MSVC, <= 1400) -#define TTI_VM_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,...) \ - TTI_DETAIL_HAS_MEMBER_WITH_TEMPLATE_SFINAE \ +#define BOOST_TTI_DETAIL_VM_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,...) \ + BOOST_TTI_DETAIL_HAS_MEMBER_WITH_TEMPLATE_SFINAE \ ( \ ( BOOST_PP_ADD(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),4), ( trait, name, 1, false, __VA_ARGS__ ) ) \ ) \ @@ -55,15 +55,15 @@ #endif // !BOOST_WORKAROUND(BOOST_MSVC, <= 1400) #else // defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE) -#define TTI_VM_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,...) \ - TTI_DETAIL_SAME(trait,name) \ +#define BOOST_TTI_DETAIL_VM_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,...) \ + BOOST_TTI_DETAIL_SAME(trait,name) \ /**/ #endif // !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE) #if !defined(BOOST_TTI_VERSION_1_5) -#define TTI_VM_DETAIL_CHECK_MORE_THAN_TWO(trait,...) \ +#define BOOST_TTI_DETAIL_VM_CHECK_MORE_THAN_TWO(trait,...) \ BOOST_PP_IIF \ ( \ BOOST_PP_EQUAL \ @@ -71,21 +71,21 @@ BOOST_PP_VARIADIC_SIZE(__VA_ARGS__), \ 2 \ ), \ - TTI_VM_DETAIL_TRAIT_CHOOSE_FROM_TWO, \ - TTI_VM_DETAIL_TRAIT_EXPAND_ARGUMENTS \ + BOOST_TTI_DETAIL_VM_TRAIT_CHOOSE_FROM_TWO, \ + BOOST_TTI_DETAIL_VM_TRAIT_EXPAND_ARGUMENTS \ ) \ (trait,__VA_ARGS__) \ /**/ -#define TTI_VM_DETAIL_TRAIT_CHOOSE_FROM_TWO(trait,...) \ +#define BOOST_TTI_DETAIL_VM_TRAIT_CHOOSE_FROM_TWO(trait,...) \ BOOST_PP_IIF \ ( \ BOOST_PP_IS_BINARY \ ( \ BOOST_PP_VARIADIC_ELEM(1,__VA_ARGS__) \ ), \ - TTI_TRAIT_HAS_TEMPLATE_CHECK_PARAMS, \ - TTI_VM_DETAIL_TRAIT_CHOOSE_IF_NIL \ + BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS, \ + BOOST_TTI_DETAIL_VM_TRAIT_CHOOSE_IF_NIL \ ) \ ( \ trait, \ @@ -94,24 +94,24 @@ ) \ /**/ -#define TTI_VM_DETAIL_IS_NIL(param) \ +#define BOOST_TTI_DETAIL_VM_IS_NIL(param) \ BOOST_PP_IS_EMPTY \ ( \ - BOOST_PP_CAT(TTI_DETAIL_IS_HELPER_,param) \ + BOOST_PP_CAT(BOOST_TTI_DETAIL_IS_HELPER_,param) \ ) \ /**/ -#define TTI_VM_DETAIL_TRAIT_CHOOSE_IF_NIL(trait,name,param) \ +#define BOOST_TTI_DETAIL_VM_TRAIT_CHOOSE_IF_NIL(trait,name,param) \ BOOST_PP_IIF \ ( \ - TTI_VM_DETAIL_IS_NIL(param), \ - TTI_DETAIL_TRAIT_HAS_TEMPLATE, \ - TTI_VM_DETAIL_CALL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS \ + BOOST_TTI_DETAIL_VM_IS_NIL(param), \ + BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE, \ + BOOST_TTI_DETAIL_VM_CALL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS \ ) \ (trait,name,param) \ /**/ -#define TTI_VM_DETAIL_VARIADIC_TAIL(...) \ +#define BOOST_TTI_DETAIL_VM_VARIADIC_TAIL(...) \ BOOST_PP_SEQ_ENUM \ ( \ BOOST_PP_SEQ_TAIL \ @@ -121,17 +121,17 @@ ) \ /**/ -#define TTI_VM_DETAIL_TRAIT_EXPAND_ARGUMENTS(trait,...) \ - TTI_VM_DETAIL_CALL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS \ +#define BOOST_TTI_DETAIL_VM_TRAIT_EXPAND_ARGUMENTS(trait,...) \ + BOOST_TTI_DETAIL_VM_CALL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS \ ( \ trait, \ BOOST_PP_VARIADIC_ELEM(0,__VA_ARGS__), \ - TTI_VM_DETAIL_VARIADIC_TAIL(__VA_ARGS__) \ + BOOST_TTI_DETAIL_VM_VARIADIC_TAIL(__VA_ARGS__) \ ) \ /**/ -#define TTI_VM_DETAIL_TRAIT_HAS_TEMPLATE(trait,...) \ - TTI_DETAIL_TRAIT_HAS_TEMPLATE \ +#define BOOST_TTI_DETAIL_VM_TRAIT_HAS_TEMPLATE(trait,...) \ + BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE \ ( \ trait, \ BOOST_PP_VARIADIC_ELEM(0,__VA_ARGS__), \ @@ -139,8 +139,8 @@ ) \ /**/ -#define TTI_VM_DETAIL_CALL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,...) \ - TTI_VM_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(BOOST_PP_CAT(trait,_detail),name,__VA_ARGS__) \ +#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 \ struct trait \ { \ @@ -154,4 +154,4 @@ #endif // BOOST_PP_VARIADICS -#endif // TTI_VM_DETAIL_TEMPLATE_PARAMS_HPP +#endif // BOOST_TTI_DETAIL_VM_TEMPLATE_PARAMS_HPP diff --git a/include/boost/tti/has_template.hpp b/include/boost/tti/has_template.hpp index 1ab33a0..7fba75d 100644 --- a/include/boost/tti/has_template.hpp +++ b/include/boost/tti/has_template.hpp @@ -13,8 +13,8 @@ /** \file */ -#if !defined(TTI_HAS_TEMPLATE_HPP) -#define TTI_HAS_TEMPLATE_HPP +#if !defined(BOOST_TTI_HAS_TEMPLATE_HPP) +#define BOOST_TTI_HAS_TEMPLATE_HPP #include #include @@ -39,8 +39,8 @@ BOOST_PP_VARIADIC_SIZE(__VA_ARGS__), \ 1 \ ), \ - TTI_VM_DETAIL_TRAIT_HAS_TEMPLATE, \ - TTI_VM_DETAIL_CHECK_MORE_THAN_TWO \ + BOOST_TTI_DETAIL_VM_TRAIT_HAS_TEMPLATE, \ + BOOST_TTI_DETAIL_VM_CHECK_MORE_THAN_TWO \ ) \ (trait,__VA_ARGS__) \ /**/ @@ -66,8 +66,8 @@ BOOST_PP_IIF \ ( \ BOOST_PP_IS_BINARY(params), \ - TTI_TRAIT_HAS_TEMPLATE_CHECK_PARAMS, \ - TTI_DETAIL_TRAIT_CHECK_IS_NIL \ + BOOST_TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS, \ + BOOST_TTI_DETAIL_TRAIT_CHECK_IS_NIL \ ) \ (trait,name,params) \ /**/ @@ -156,4 +156,4 @@ /**/ #endif // BOOST_TTI_VERSION_1_5 -#endif // TTI_HAS_TEMPLATE_HPP +#endif // BOOST_TTI_HAS_TEMPLATE_HPP diff --git a/include/boost/tti/has_template_check_params.hpp b/include/boost/tti/has_template_check_params.hpp index 406dca5..236a46c 100644 --- a/include/boost/tti/has_template_check_params.hpp +++ b/include/boost/tti/has_template_check_params.hpp @@ -4,8 +4,8 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt). -#if !defined(TTI_HAS_TEMPLATE_CHECK_PARAMS_HPP) -#define TTI_HAS_TEMPLATE_CHECK_PARAMS_HPP +#if !defined(BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_HPP) +#define BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_HPP #if defined(BOOST_TTI_VERSION_1_5) @@ -53,7 +53,7 @@ */ #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) \ + BOOST_TTI_DETAIL_TRAIT_CALL_HAS_TEMPLATE_CHECK_PARAMS(BOOST_PP_CAT(trait,_detail),name,tpSeq) \ template \ struct trait : \ BOOST_PP_CAT(trait,_detail) \ @@ -98,4 +98,4 @@ /**/ #endif // BOOST_TTI_VERSION_1_5 -#endif // !TTI_HAS_TEMPLATE_CHECK_PARAMS_HPP +#endif // !BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_HPP diff --git a/include/boost/tti/vm_has_template_check_params.hpp b/include/boost/tti/vm_has_template_check_params.hpp index ee0f966..1e698ae 100644 --- a/include/boost/tti/vm_has_template_check_params.hpp +++ b/include/boost/tti/vm_has_template_check_params.hpp @@ -4,8 +4,8 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt). -#if !defined(TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_HPP) -#define TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_HPP +#if !defined(BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_HPP) +#define BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_HPP #if defined(BOOST_TTI_VERSION_1_5) @@ -54,7 +54,7 @@ */ #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__) \ + BOOST_TTI_DETAIL_VM_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(BOOST_PP_CAT(trait,_detail),name,__VA_ARGS__) \ template \ struct trait \ { \ @@ -100,4 +100,4 @@ #endif // BOOST_PP_VARIADICS #endif // BOOST_TTI_VERSION_1_5 -#endif // TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_HPP +#endif // BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_HPP