From 530e6801fb240117e702e52589bb5e5f61baa647 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Fri, 11 Mar 2011 23:33:36 +0000 Subject: [PATCH] Use namespace macro. [SVN r69862] --- include/boost/tti/comp_mem_fun.hpp | 4 ++-- include/boost/tti/comp_mem_fun_template.hpp | 4 ++-- include/boost/tti/comp_static_mem_fun.hpp | 4 ++-- include/boost/tti/comp_static_mem_fun_template.hpp | 4 ++-- include/boost/tti/gen/comp_mem_fun_gen.hpp | 4 ++-- include/boost/tti/gen/comp_mem_fun_template_gen.hpp | 4 ++-- include/boost/tti/gen/comp_static_mem_fun_gen.hpp | 4 ++-- .../tti/gen/comp_static_mem_fun_template_gen.hpp | 4 ++-- include/boost/tti/gen/mem_data_gen.hpp | 4 ++-- include/boost/tti/gen/mem_fun_gen.hpp | 4 ++-- include/boost/tti/gen/mem_fun_template_gen.hpp | 4 ++-- include/boost/tti/gen/mem_type_gen.hpp | 4 ++-- include/boost/tti/gen/namespace_gen.hpp | 6 ++++++ include/boost/tti/gen/static_mem_data_gen.hpp | 4 ++-- include/boost/tti/gen/static_mem_fun_gen.hpp | 4 ++-- .../boost/tti/gen/static_mem_fun_template_gen.hpp | 4 ++-- include/boost/tti/gen/template_gen.hpp | 4 ++-- include/boost/tti/gen/template_params_gen.hpp | 4 ++-- include/boost/tti/gen/trait_gen.hpp | 4 ++-- include/boost/tti/gen/type_gen.hpp | 4 ++-- .../boost/tti/gen/vm_comp_mem_fun_template_gen.hpp | 4 ++-- .../tti/gen/vm_comp_static_mem_fun_template_gen.hpp | 4 ++-- include/boost/tti/gen/vm_mem_fun_template_gen.hpp | 4 ++-- .../boost/tti/gen/vm_static_mem_fun_template_gen.hpp | 4 ++-- include/boost/tti/gen/vm_template_params_gen.hpp | 4 ++-- include/boost/tti/mem_data.hpp | 4 ++-- include/boost/tti/mem_fun.hpp | 4 ++-- include/boost/tti/mem_fun_template.hpp | 4 ++-- include/boost/tti/mem_type.hpp | 12 ++++++------ include/boost/tti/mf/mf_mem_fun.hpp | 3 ++- include/boost/tti/mf/mf_mem_fun_template.hpp | 3 ++- include/boost/tti/mf/mf_mem_type.hpp | 5 +++-- include/boost/tti/mf/mf_static_mem_fun.hpp | 3 ++- include/boost/tti/mf/mf_static_mem_fun_template.hpp | 3 ++- include/boost/tti/mf/mf_type.hpp | 3 ++- include/boost/tti/static_mem_data.hpp | 4 ++-- include/boost/tti/static_mem_fun.hpp | 4 ++-- include/boost/tti/static_mem_fun_template.hpp | 4 ++-- include/boost/tti/template.hpp | 4 ++-- include/boost/tti/template_params.hpp | 4 ++-- include/boost/tti/type.hpp | 12 ++++++------ include/boost/tti/vm_comp_mem_fun_template.hpp | 4 ++-- .../boost/tti/vm_comp_static_mem_fun_template.hpp | 4 ++-- include/boost/tti/vm_mem_fun_template.hpp | 4 ++-- include/boost/tti/vm_static_mem_fun_template.hpp | 4 ++-- include/boost/tti/vm_template_params.hpp | 4 ++-- test/Jamfile.v2 | 1 - 47 files changed, 105 insertions(+), 94 deletions(-) create mode 100644 include/boost/tti/gen/namespace_gen.hpp diff --git a/include/boost/tti/comp_mem_fun.hpp b/include/boost/tti/comp_mem_fun.hpp index 58f683f..863dccb 100644 --- a/include/boost/tti/comp_mem_fun.hpp +++ b/include/boost/tti/comp_mem_fun.hpp @@ -46,7 +46,7 @@ namespace boost \ } \ template \ struct trait : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ } \ @@ -85,7 +85,7 @@ namespace boost \ { \ template \ struct apply : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ }; \ diff --git a/include/boost/tti/comp_mem_fun_template.hpp b/include/boost/tti/comp_mem_fun_template.hpp index 7d70331..c21bb4d 100644 --- a/include/boost/tti/comp_mem_fun_template.hpp +++ b/include/boost/tti/comp_mem_fun_template.hpp @@ -52,7 +52,7 @@ namespace boost \ } \ template \ struct trait : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ } \ @@ -94,7 +94,7 @@ namespace boost \ { \ template \ struct apply : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ }; \ diff --git a/include/boost/tti/comp_static_mem_fun.hpp b/include/boost/tti/comp_static_mem_fun.hpp index 602f533..292a252 100644 --- a/include/boost/tti/comp_static_mem_fun.hpp +++ b/include/boost/tti/comp_static_mem_fun.hpp @@ -49,7 +49,7 @@ namespace boost \ } \ template \ struct trait : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ } \ @@ -91,7 +91,7 @@ namespace boost \ { \ template \ struct apply : \ - boost::tti::detail::trait::apply \ + BOOST_TTI_NAMESPACE::detail::trait::apply \ { \ }; \ }; \ diff --git a/include/boost/tti/comp_static_mem_fun_template.hpp b/include/boost/tti/comp_static_mem_fun_template.hpp index 4b7ce3c..76418af 100644 --- a/include/boost/tti/comp_static_mem_fun_template.hpp +++ b/include/boost/tti/comp_static_mem_fun_template.hpp @@ -56,7 +56,7 @@ namespace boost \ } \ template \ struct trait : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ } \ @@ -102,7 +102,7 @@ namespace boost \ { \ template \ struct apply : \ - boost::tti::detail::trait::apply \ + BOOST_TTI_NAMESPACE::detail::trait::apply \ { \ }; \ }; \ diff --git a/include/boost/tti/gen/comp_mem_fun_gen.hpp b/include/boost/tti/gen/comp_mem_fun_gen.hpp index d723c84..7e40367 100644 --- a/include/boost/tti/gen/comp_mem_fun_gen.hpp +++ b/include/boost/tti/gen/comp_mem_fun_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_COMP_MEMBER_FUNCTION_GEN(name) \ - boost::tti::BOOST_TTI_HAS_COMP_MEMBER_FUNCTION_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_COMP_MEMBER_FUNCTION_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_COMP_MEMBER_FUNCTION_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_COMP_MEMBER_FUNCTION_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_COMP_MEMBER_FUNCTION_GEN_BASE(name) \ /**/ #endif // TTI_COMP_MEM_FUN_GEN_HPP diff --git a/include/boost/tti/gen/comp_mem_fun_template_gen.hpp b/include/boost/tti/gen/comp_mem_fun_template_gen.hpp index cdb8e5e..c1e73e5 100644 --- a/include/boost/tti/gen/comp_mem_fun_template_gen.hpp +++ b/include/boost/tti/gen/comp_mem_fun_template_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #endif // TTI_COMP_MEM_FUN_TEMPLATE_GEN_HPP diff --git a/include/boost/tti/gen/comp_static_mem_fun_gen.hpp b/include/boost/tti/gen/comp_static_mem_fun_gen.hpp index 09f48fc..1219900 100644 --- a/include/boost/tti/gen/comp_static_mem_fun_gen.hpp +++ b/include/boost/tti/gen/comp_static_mem_fun_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION_GEN(name) \ - boost::tti::BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION_GEN_BASE(name) \ /**/ #endif // TTI_COMP_STATIC_MEM_FUN_GEN_HPP diff --git a/include/boost/tti/gen/comp_static_mem_fun_template_gen.hpp b/include/boost/tti/gen/comp_static_mem_fun_template_gen.hpp index 4fe1e3b..30c1dce 100644 --- a/include/boost/tti/gen/comp_static_mem_fun_template_gen.hpp +++ b/include/boost/tti/gen/comp_static_mem_fun_template_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #endif // TTI_COMP_STATIC_MEM_FUN_TEMPLATE_GEN_HPP diff --git a/include/boost/tti/gen/mem_data_gen.hpp b/include/boost/tti/gen/mem_data_gen.hpp index 5b38b40..c3940de 100644 --- a/include/boost/tti/gen/mem_data_gen.hpp +++ b/include/boost/tti/gen/mem_data_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_MEMBER_DATA_GEN(name) \ - boost::tti::BOOST_TTI_HAS_MEMBER_DATA_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_MEMBER_DATA_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_MEMBER_DATA_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_MEMBER_DATA_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_MEMBER_DATA_GEN_BASE(name) \ /**/ #endif // TTI_MEMBER_DATA_GEN_HPP diff --git a/include/boost/tti/gen/mem_fun_gen.hpp b/include/boost/tti/gen/mem_fun_gen.hpp index 3ba8a9a..b01ee24 100644 --- a/include/boost/tti/gen/mem_fun_gen.hpp +++ b/include/boost/tti/gen/mem_fun_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_MEMBER_FUNCTION_GEN(name) \ - boost::tti::BOOST_TTI_HAS_MEMBER_FUNCTION_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_MEMBER_FUNCTION_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_GEN_BASE(name) \ /**/ #endif // TTI_MEMBER_FUNCTION_GEN_HPP diff --git a/include/boost/tti/gen/mem_fun_template_gen.hpp b/include/boost/tti/gen/mem_fun_template_gen.hpp index 9176f71..3a86fa2 100644 --- a/include/boost/tti/gen/mem_fun_template_gen.hpp +++ b/include/boost/tti/gen/mem_fun_template_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_HAS_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #endif // TTI_MEMBER_FUNCTION_TEMPLATE_GEN_HPP diff --git a/include/boost/tti/gen/mem_type_gen.hpp b/include/boost/tti/gen/mem_type_gen.hpp index a4b5249..d955c54 100644 --- a/include/boost/tti/gen/mem_type_gen.hpp +++ b/include/boost/tti/gen/mem_type_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_MEMBER_TYPE_GEN(name) \ - boost::tti::BOOST_TTI_MEMBER_TYPE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MEMBER_TYPE_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_MEMBER_TYPE_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_MEMBER_TYPE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_MEMBER_TYPE_GEN_BASE(name) \ /**/ #endif // TTI_MEMBER_TYPE_GEN_HPP diff --git a/include/boost/tti/gen/namespace_gen.hpp b/include/boost/tti/gen/namespace_gen.hpp new file mode 100644 index 0000000..652c97c --- /dev/null +++ b/include/boost/tti/gen/namespace_gen.hpp @@ -0,0 +1,6 @@ +#if !defined(TTI_NAMESPACE_GEN_HPP) +#define TTI_NAMESPACE_GEN_HPP + +#define BOOST_TTI_NAMESPACE boost::tti + +#endif // TTI_NAMESPACE_GEN_HPP diff --git a/include/boost/tti/gen/static_mem_data_gen.hpp b/include/boost/tti/gen/static_mem_data_gen.hpp index a9d2e82..c2a6176 100644 --- a/include/boost/tti/gen/static_mem_data_gen.hpp +++ b/include/boost/tti/gen/static_mem_data_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_STATIC_MEMBER_DATA_GEN(name) \ - boost::tti::BOOST_TTI_HAS_STATIC_MEMBER_DATA_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_STATIC_MEMBER_DATA_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_STATIC_MEMBER_DATA_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_STATIC_MEMBER_DATA_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_STATIC_MEMBER_DATA_GEN_BASE(name) \ /**/ #endif // TTI_STATIC_MEMBER_DATA_GEN_HPP diff --git a/include/boost/tti/gen/static_mem_fun_gen.hpp b/include/boost/tti/gen/static_mem_fun_gen.hpp index 4af51cf..d711309 100644 --- a/include/boost/tti/gen/static_mem_fun_gen.hpp +++ b/include/boost/tti/gen/static_mem_fun_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION_GEN(name) \ - boost::tti::BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_STATIC_MEMBER_FUNCTION_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_STATIC_MEMBER_FUNCTION_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_STATIC_MEMBER_FUNCTION_GEN_BASE(name) \ /**/ #endif // TTI_STATIC_MEMBER_FUNCTION_GEN_HPP diff --git a/include/boost/tti/gen/static_mem_fun_template_gen.hpp b/include/boost/tti/gen/static_mem_fun_template_gen.hpp index 61fd469..6eea69f 100644 --- a/include/boost/tti/gen/static_mem_fun_template_gen.hpp +++ b/include/boost/tti/gen/static_mem_fun_template_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #endif // TTI_STATIC_MEM_FUN_TEMPLATE_GEN_HPP diff --git a/include/boost/tti/gen/template_gen.hpp b/include/boost/tti/gen/template_gen.hpp index ce49323..2fa118b 100644 --- a/include/boost/tti/gen/template_gen.hpp +++ b/include/boost/tti/gen/template_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_HAS_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_TEMPLATE_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_TEMPLATE_GEN_BASE(name) \ /**/ #endif // TTI_TEMPLATE_GEN_HPP diff --git a/include/boost/tti/gen/template_params_gen.hpp b/include/boost/tti/gen/template_params_gen.hpp index 3cd5974..d1faec1 100644 --- a/include/boost/tti/gen/template_params_gen.hpp +++ b/include/boost/tti/gen/template_params_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(name) \ - boost::tti::BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN_BASE(name) \ /**/ #endif // TTI_TEMPLATE_PARAMS_GEN_HPP diff --git a/include/boost/tti/gen/trait_gen.hpp b/include/boost/tti/gen/trait_gen.hpp index b58d9e2..a1832f7 100644 --- a/include/boost/tti/gen/trait_gen.hpp +++ b/include/boost/tti/gen/trait_gen.hpp @@ -1,14 +1,14 @@ #if !defined(TTI_TRAIT_GEN_HPP) #define TTI_TRAIT_GEN_HPP -#include +#include "namespace_gen.hpp" #define BOOST_TTI_TRAIT_GEN_BASE(name) \ name \ /**/ #define BOOST_TTI_TRAIT_GEN(name) \ - boost::tti::BOOST_TTI_TRAIT_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_TRAIT_GEN_BASE(name) \ /**/ #endif // TTI_TRAIT_GEN_HPP diff --git a/include/boost/tti/gen/type_gen.hpp b/include/boost/tti/gen/type_gen.hpp index 45b8f89..96d3b6d 100644 --- a/include/boost/tti/gen/type_gen.hpp +++ b/include/boost/tti/gen/type_gen.hpp @@ -14,11 +14,11 @@ /**/ #define BOOST_TTI_HAS_TYPE_GEN(name) \ - boost::tti::BOOST_TTI_HAS_TYPE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_HAS_TYPE_GEN_BASE(name) \ /**/ #define BOOST_TTI_MTFC_HAS_TYPE_GEN(name) \ - boost::tti::BOOST_TTI_MTFC_HAS_TYPE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_MTFC_HAS_TYPE_GEN_BASE(name) \ /**/ #endif // TTI_TYPE_GEN_HPP diff --git a/include/boost/tti/gen/vm_comp_mem_fun_template_gen.hpp b/include/boost/tti/gen/vm_comp_mem_fun_template_gen.hpp index 6509b9c..5c44517 100644 --- a/include/boost/tti/gen/vm_comp_mem_fun_template_gen.hpp +++ b/include/boost/tti/gen/vm_comp_mem_fun_template_gen.hpp @@ -17,11 +17,11 @@ /**/ #define BOOST_TTI_VM_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_VM_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_VM_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #define BOOST_TTI_VM_MTFC_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_VM_MTFC_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_VM_MTFC_HAS_COMP_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #endif // !defined(BOOST_NO_VARIADIC_MACROS) diff --git a/include/boost/tti/gen/vm_comp_static_mem_fun_template_gen.hpp b/include/boost/tti/gen/vm_comp_static_mem_fun_template_gen.hpp index 6479158..61b7322 100644 --- a/include/boost/tti/gen/vm_comp_static_mem_fun_template_gen.hpp +++ b/include/boost/tti/gen/vm_comp_static_mem_fun_template_gen.hpp @@ -17,11 +17,11 @@ /**/ #define BOOST_TTI_VM_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_VM_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_VM_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #define BOOST_TTI_VM_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_VM_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_VM_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #endif // !defined(BOOST_NO_VARIADIC_MACROS) diff --git a/include/boost/tti/gen/vm_mem_fun_template_gen.hpp b/include/boost/tti/gen/vm_mem_fun_template_gen.hpp index 725a67e..26a7dbb 100644 --- a/include/boost/tti/gen/vm_mem_fun_template_gen.hpp +++ b/include/boost/tti/gen/vm_mem_fun_template_gen.hpp @@ -17,11 +17,11 @@ /**/ #define BOOST_TTI_VM_HAS_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_VM_HAS_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_VM_HAS_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #define BOOST_TTI_VM_MTFC_HAS_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_VM_MTFC_HAS_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_VM_MTFC_HAS_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #endif // !defined(BOOST_NO_VARIADIC_MACROS) diff --git a/include/boost/tti/gen/vm_static_mem_fun_template_gen.hpp b/include/boost/tti/gen/vm_static_mem_fun_template_gen.hpp index 926559a..9606667 100644 --- a/include/boost/tti/gen/vm_static_mem_fun_template_gen.hpp +++ b/include/boost/tti/gen/vm_static_mem_fun_template_gen.hpp @@ -17,11 +17,11 @@ /**/ #define BOOST_TTI_VM_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_VM_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_VM_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #define BOOST_TTI_VM_MTFC_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN(name) \ - boost::tti::BOOST_TTI_VM_MTFC_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_VM_MTFC_HAS_STATIC_MEMBER_FUNCTION_TEMPLATE_GEN_BASE(name) \ /**/ #endif // !defined(BOOST_NO_VARIADIC_MACROS) diff --git a/include/boost/tti/gen/vm_template_params_gen.hpp b/include/boost/tti/gen/vm_template_params_gen.hpp index 59326a9..aafdbee 100644 --- a/include/boost/tti/gen/vm_template_params_gen.hpp +++ b/include/boost/tti/gen/vm_template_params_gen.hpp @@ -17,11 +17,11 @@ /**/ #define BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(name) \ - boost::tti::BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN_BASE(name) \ /**/ #define BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(name) \ - boost::tti::BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN_BASE(name) \ + BOOST_TTI_NAMESPACE::BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN_BASE(name) \ /**/ #endif // !defined(BOOST_NO_VARIADIC_MACROS) diff --git a/include/boost/tti/mem_data.hpp b/include/boost/tti/mem_data.hpp index b2321e6..c5a4db3 100644 --- a/include/boost/tti/mem_data.hpp +++ b/include/boost/tti/mem_data.hpp @@ -46,7 +46,7 @@ namespace boost \ } \ template \ struct trait : \ - boost::tti::detail::trait::type,typename boost::remove_const::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type,typename boost::remove_const::type> \ { \ }; \ } \ @@ -85,7 +85,7 @@ namespace boost \ { \ template \ struct apply : \ - boost::tti::detail::trait::type,typename boost::remove_const::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type,typename boost::remove_const::type> \ { \ }; \ }; \ diff --git a/include/boost/tti/mem_fun.hpp b/include/boost/tti/mem_fun.hpp index 15bdcfe..0658ed5 100644 --- a/include/boost/tti/mem_fun.hpp +++ b/include/boost/tti/mem_fun.hpp @@ -52,7 +52,7 @@ namespace boost \ } \ template,class TAG = boost::function_types::null_tag> \ struct trait : \ - boost::tti::detail::trait::type,typename boost::remove_const::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type,typename boost::remove_const::type> \ { \ }; \ } \ @@ -95,7 +95,7 @@ namespace boost \ { \ template,class TAG = boost::function_types::null_tag> \ struct apply : \ - boost::tti::detail::trait::type,typename boost::remove_const::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type,typename boost::remove_const::type> \ { \ }; \ }; \ diff --git a/include/boost/tti/mem_fun_template.hpp b/include/boost/tti/mem_fun_template.hpp index b5761d7..a652b26 100644 --- a/include/boost/tti/mem_fun_template.hpp +++ b/include/boost/tti/mem_fun_template.hpp @@ -59,7 +59,7 @@ namespace boost \ } \ template,class TAG = boost::function_types::null_tag> \ struct trait : \ - boost::tti::detail::trait::type,typename boost::remove_const::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type,typename boost::remove_const::type> \ { \ }; \ } \ @@ -106,7 +106,7 @@ namespace boost \ { \ template,class TAG = boost::function_types::null_tag> \ struct apply : \ - boost::tti::detail::trait::type,typename boost::remove_const::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type,typename boost::remove_const::type> \ { \ }; \ }; \ diff --git a/include/boost/tti/mem_type.hpp b/include/boost/tti/mem_type.hpp index fc0cd66..5ee7bd4 100644 --- a/include/boost/tti/mem_type.hpp +++ b/include/boost/tti/mem_type.hpp @@ -54,9 +54,9 @@ namespace boost \ struct trait : \ boost::mpl::eval_if \ < \ - boost::tti::detail::trait, \ - boost::tti::detail::member_type::trait, \ - boost::mpl::identity \ + BOOST_TTI_NAMESPACE::detail::trait, \ + BOOST_TTI_NAMESPACE::detail::member_type::trait, \ + boost::mpl::identity \ > \ { \ }; \ @@ -102,9 +102,9 @@ namespace boost \ struct apply : \ boost::mpl::eval_if \ < \ - boost::tti::detail::trait, \ - boost::tti::detail::member_type::trait, \ - boost::mpl::identity \ + BOOST_TTI_NAMESPACE::detail::trait, \ + BOOST_TTI_NAMESPACE::detail::member_type::trait, \ + boost::mpl::identity \ > \ { \ }; \ diff --git a/include/boost/tti/mf/mf_mem_fun.hpp b/include/boost/tti/mf/mf_mem_fun.hpp index ce66a31..6ec3d31 100644 --- a/include/boost/tti/mf/mf_mem_fun.hpp +++ b/include/boost/tti/mf/mf_mem_fun.hpp @@ -8,6 +8,7 @@ #include #include #include +#include "../gen/namespace_gen.hpp" #include "../detail/dtself.hpp" /* @@ -63,7 +64,7 @@ namespace boost HasMemberFunction, typename T::type, typename R::type, - typename boost::mpl::transform >::type, + typename boost::mpl::transform >::type, TAG >::type { diff --git a/include/boost/tti/mf/mf_mem_fun_template.hpp b/include/boost/tti/mf/mf_mem_fun_template.hpp index 1f4cfbd..8d0d300 100644 --- a/include/boost/tti/mf/mf_mem_fun_template.hpp +++ b/include/boost/tti/mf/mf_mem_fun_template.hpp @@ -8,6 +8,7 @@ #include #include #include +#include "../gen/namespace_gen.hpp" #include "../detail/dtself.hpp" /* @@ -63,7 +64,7 @@ namespace boost HasMemberFunctionTemplate, typename T::type, typename R::type, - typename boost::mpl::transform >::type, + typename boost::mpl::transform >::type, TAG >::type { diff --git a/include/boost/tti/mf/mf_mem_type.hpp b/include/boost/tti/mf/mf_mem_type.hpp index 67c804f..bd2f406 100644 --- a/include/boost/tti/mf/mf_mem_type.hpp +++ b/include/boost/tti/mf/mf_mem_type.hpp @@ -7,6 +7,7 @@ #include #include #include +#include "../gen/namespace_gen.hpp" #include "../detail/dnotype.hpp" /* @@ -43,7 +44,7 @@ namespace boost boost::is_same < T, - boost::tti::detail::notype + BOOST_TTI_NAMESPACE::detail::notype > > { @@ -69,7 +70,7 @@ namespace boost boost::is_same < typename T::type, - boost::tti::detail::notype + BOOST_TTI_NAMESPACE::detail::notype > > { diff --git a/include/boost/tti/mf/mf_static_mem_fun.hpp b/include/boost/tti/mf/mf_static_mem_fun.hpp index 609662d..bba7e81 100644 --- a/include/boost/tti/mf/mf_static_mem_fun.hpp +++ b/include/boost/tti/mf/mf_static_mem_fun.hpp @@ -8,6 +8,7 @@ #include #include #include +#include "../gen/namespace_gen.hpp" #include "../detail/dtself.hpp" /* @@ -61,7 +62,7 @@ namespace boost HasStaticMemberFunction, typename T::type, typename R::type, - typename boost::mpl::transform >::type, + typename boost::mpl::transform >::type, TAG >::type { diff --git a/include/boost/tti/mf/mf_static_mem_fun_template.hpp b/include/boost/tti/mf/mf_static_mem_fun_template.hpp index 4993f71..106492d 100644 --- a/include/boost/tti/mf/mf_static_mem_fun_template.hpp +++ b/include/boost/tti/mf/mf_static_mem_fun_template.hpp @@ -8,6 +8,7 @@ #include #include #include +#include "../gen/namespace_gen.hpp" #include "../detail/dtself.hpp" /* @@ -61,7 +62,7 @@ namespace boost HasStaticMemberFunctionTemplate, typename T::type, typename R::type, - typename boost::mpl::transform >::type, + typename boost::mpl::transform >::type, TAG >::type { diff --git a/include/boost/tti/mf/mf_type.hpp b/include/boost/tti/mf/mf_type.hpp index 1aefaee..f478056 100644 --- a/include/boost/tti/mf/mf_type.hpp +++ b/include/boost/tti/mf/mf_type.hpp @@ -5,6 +5,7 @@ #include #include #include +#include "../gen/namespace_gen.hpp" #include "../detail/dnotype.hpp" /* @@ -45,7 +46,7 @@ namespace boost < class HasType, class T, - class U = boost::mpl::identity + class U = boost::mpl::identity > struct mf_has_type : boost::mpl::apply diff --git a/include/boost/tti/static_mem_data.hpp b/include/boost/tti/static_mem_data.hpp index 0b8ba0e..a892079 100644 --- a/include/boost/tti/static_mem_data.hpp +++ b/include/boost/tti/static_mem_data.hpp @@ -48,7 +48,7 @@ namespace boost \ } \ template \ struct trait : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ } \ @@ -90,7 +90,7 @@ namespace boost \ { \ template \ struct apply : \ - boost::tti::detail::trait::apply \ + BOOST_TTI_NAMESPACE::detail::trait::apply \ { \ }; \ }; \ diff --git a/include/boost/tti/static_mem_fun.hpp b/include/boost/tti/static_mem_fun.hpp index d94c692..73c53fb 100644 --- a/include/boost/tti/static_mem_fun.hpp +++ b/include/boost/tti/static_mem_fun.hpp @@ -52,7 +52,7 @@ namespace boost \ } \ template,class TAG = boost::function_types::null_tag> \ struct trait : \ - boost::tti::detail::trait::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type> \ { \ }; \ } \ @@ -95,7 +95,7 @@ namespace boost \ { \ template,class TAG = boost::function_types::null_tag> \ struct apply : \ - boost::tti::detail::trait::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type> \ { \ }; \ }; \ diff --git a/include/boost/tti/static_mem_fun_template.hpp b/include/boost/tti/static_mem_fun_template.hpp index 1a33b69..f734cea 100644 --- a/include/boost/tti/static_mem_fun_template.hpp +++ b/include/boost/tti/static_mem_fun_template.hpp @@ -59,7 +59,7 @@ namespace boost \ } \ template,class TAG = boost::function_types::null_tag> \ struct trait : \ - boost::tti::detail::trait::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type> \ { \ }; \ } \ @@ -106,7 +106,7 @@ namespace boost \ { \ template,class TAG = boost::function_types::null_tag> \ struct apply : \ - boost::tti::detail::trait::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type> \ { \ }; \ }; \ diff --git a/include/boost/tti/template.hpp b/include/boost/tti/template.hpp index 9240a2e..b6fa0d8 100644 --- a/include/boost/tti/template.hpp +++ b/include/boost/tti/template.hpp @@ -45,7 +45,7 @@ namespace boost \ } \ template \ struct trait : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ } \ @@ -84,7 +84,7 @@ namespace boost \ { \ template \ struct apply : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ }; \ diff --git a/include/boost/tti/template_params.hpp b/include/boost/tti/template_params.hpp index 7fa3fb2..aba9501 100644 --- a/include/boost/tti/template_params.hpp +++ b/include/boost/tti/template_params.hpp @@ -48,7 +48,7 @@ namespace boost \ } \ template \ struct trait : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ } \ @@ -90,7 +90,7 @@ namespace boost \ { \ template \ struct apply : \ - boost::tti::detail::trait::apply \ + BOOST_TTI_NAMESPACE::detail::trait::apply \ { \ }; \ }; \ diff --git a/include/boost/tti/type.hpp b/include/boost/tti/type.hpp index f67cc50..4730328 100644 --- a/include/boost/tti/type.hpp +++ b/include/boost/tti/type.hpp @@ -45,13 +45,13 @@ namespace boost \ { \ TTI_DETAIL_TRAIT_HAS_TYPE(trait,name) \ } \ - template \ + template \ struct trait : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ < \ T, \ U, \ - typename boost::tti::detail::ttimpl::trait::type \ + typename BOOST_TTI_NAMESPACE::detail::ttimpl::trait::type \ > \ { \ }; \ @@ -90,13 +90,13 @@ namespace boost \ } \ struct trait \ { \ - template \ + template \ struct apply : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ < \ T, \ U, \ - typename boost::tti::detail::ttimpl::trait::type \ + typename BOOST_TTI_NAMESPACE::detail::ttimpl::trait::type \ > \ { \ }; \ diff --git a/include/boost/tti/vm_comp_mem_fun_template.hpp b/include/boost/tti/vm_comp_mem_fun_template.hpp index 383c1b4..776fcff 100644 --- a/include/boost/tti/vm_comp_mem_fun_template.hpp +++ b/include/boost/tti/vm_comp_mem_fun_template.hpp @@ -69,7 +69,7 @@ namespace boost \ } \ template \ struct trait : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ } \ @@ -124,7 +124,7 @@ namespace boost \ { \ template \ struct apply : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ }; \ diff --git a/include/boost/tti/vm_comp_static_mem_fun_template.hpp b/include/boost/tti/vm_comp_static_mem_fun_template.hpp index f46a26a..6fca6e8 100644 --- a/include/boost/tti/vm_comp_static_mem_fun_template.hpp +++ b/include/boost/tti/vm_comp_static_mem_fun_template.hpp @@ -73,7 +73,7 @@ namespace boost \ } \ template \ struct trait : \ - boost::tti::detail::trait \ + BOOST_TTI_NAMESPACE::detail::trait \ { \ }; \ } \ @@ -132,7 +132,7 @@ namespace boost \ { \ template \ struct apply : \ - boost::tti::detail::trait::apply \ + BOOST_TTI_NAMESPACE::detail::trait::apply \ { \ }; \ }; \ diff --git a/include/boost/tti/vm_mem_fun_template.hpp b/include/boost/tti/vm_mem_fun_template.hpp index 9459eeb..8b12227 100644 --- a/include/boost/tti/vm_mem_fun_template.hpp +++ b/include/boost/tti/vm_mem_fun_template.hpp @@ -76,7 +76,7 @@ namespace boost \ } \ template,class TAG = boost::function_types::null_tag> \ struct trait : \ - boost::tti::detail::trait::type,typename boost::remove_const::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type,typename boost::remove_const::type> \ { \ }; \ } \ @@ -136,7 +136,7 @@ namespace boost \ { \ template,class TAG = boost::function_types::null_tag> \ struct apply : \ - boost::tti::detail::trait::type,typename boost::remove_const::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type,typename boost::remove_const::type> \ { \ }; \ }; \ diff --git a/include/boost/tti/vm_static_mem_fun_template.hpp b/include/boost/tti/vm_static_mem_fun_template.hpp index 9310cc6..61855d4 100644 --- a/include/boost/tti/vm_static_mem_fun_template.hpp +++ b/include/boost/tti/vm_static_mem_fun_template.hpp @@ -76,7 +76,7 @@ namespace boost \ } \ template,class TAG = boost::function_types::null_tag> \ struct trait : \ - boost::tti::detail::trait::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type> \ { \ }; \ } \ @@ -136,7 +136,7 @@ namespace boost \ { \ template,class TAG = boost::function_types::null_tag> \ struct apply : \ - boost::tti::detail::trait::type> \ + BOOST_TTI_NAMESPACE::detail::trait::type> \ { \ }; \ }; \ diff --git a/include/boost/tti/vm_template_params.hpp b/include/boost/tti/vm_template_params.hpp index a3efb15..df7abdf 100644 --- a/include/boost/tti/vm_template_params.hpp +++ b/include/boost/tti/vm_template_params.hpp @@ -50,7 +50,7 @@ namespace boost \ template \ struct trait \ { \ - typedef typename boost::tti::detail::trait::type type; \ + typedef typename BOOST_TTI_NAMESPACE::detail::trait::type type; \ \ BOOST_STATIC_CONSTANT(bool,value=type::value); \ }; \ @@ -92,7 +92,7 @@ namespace boost \ template \ struct apply \ { \ - typedef typename boost::tti::detail::trait::apply::type type; \ + typedef typename BOOST_TTI_NAMESPACE::detail::trait::apply::type type; \ \ BOOST_STATIC_CONSTANT(bool,value=type::value); \ }; \ diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 6aac6d0..67f6e4e 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -133,7 +133,6 @@ alias tti [ compile-fail test_mf_has_template_cp_fail3.cpp ] [ run test_mf_mem_type.cpp ] [ compile test_mf_mem_type_compile.cpp ] -# [ run test_has_fun_template.cpp ] ; alias ttivm