|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81327 - in trunk: boost/tti boost/tti/detail libs/tti/test
From: eldiener_at_[hidden]
Date: 2012-11-14 06:13:43
Author: eldiener
Date: 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
New Revision: 81327
URL: http://svn.boost.org/trac/boost/changeset/81327
Log:
Updates to member data and member function syntax.
Added:
trunk/boost/tti/detail/ddeftype.hpp (contents, props changed)
trunk/boost/tti/detail/dftclass.hpp (contents, props changed)
trunk/boost/tti/detail/dnullptr.hpp (contents, props changed)
trunk/libs/tti/test/test_has_mem_data2.cpp (contents, props changed)
Text files modified:
trunk/boost/tti/detail/dcomp_mem_fun.hpp | 92 +++--------------------
trunk/boost/tti/detail/dcomp_static_mem_fun.hpp | 38 +-------
trunk/boost/tti/detail/dmem_data.hpp | 71 +++++++++++++++---
trunk/boost/tti/detail/dmem_fun.hpp | 73 ++++++++++++------
trunk/boost/tti/detail/dmem_type.hpp | 10 +-
trunk/boost/tti/detail/dstatic_mem_data.hpp | 38 +-------
trunk/boost/tti/detail/dstatic_mem_fun.hpp | 34 +-------
trunk/boost/tti/detail/dtype.hpp | 11 +-
trunk/boost/tti/has_member_data.hpp | 17 +++-
trunk/boost/tti/has_member_function.hpp | 19 ++--
trunk/boost/tti/has_member_function_with_sig.hpp | 12 +-
trunk/boost/tti/has_static_member_data.hpp | 2
trunk/boost/tti/has_static_member_function_with_sig.hpp | 2
trunk/boost/tti/has_template.hpp | 156 ++++++++++++++++++++++++++++++++++++++++
trunk/boost/tti/has_type.hpp | 3
trunk/boost/tti/member_type.hpp | 4
trunk/boost/tti/tti.hpp | 9 --
trunk/boost/tti/vm_has_template_check_params.hpp | 1
trunk/libs/tti/test/Jamfile.v2 | 3
19 files changed, 337 insertions(+), 258 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 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -4,95 +4,29 @@
// 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_COMP_MEM_FUN_HPP)
-#define TTI_DETAIL_COMP_MEM_FUN_HPP
+#if !defined(BOOST_TTI_DETAIL_COMP_MEM_FUN_HPP)
+#define BOOST_TTI_DETAIL_COMP_MEM_FUN_HPP
#include <boost/config.hpp>
-#include <boost/mpl/at.hpp>
#include <boost/mpl/bool.hpp>
-#include <boost/mpl/identity.hpp>
-#include <boost/mpl/int.hpp>
-#include <boost/mpl/quote.hpp>
-#include <boost/function_types/parameter_types.hpp>
#include <boost/preprocessor/cat.hpp>
+#include <boost/tti/detail/dftclass.hpp>
+#include <boost/tti/detail/dnullptr.hpp>
+#include <boost/tti/gen/namespace_gen.hpp>
#include <boost/type_traits/remove_const.hpp>
#include <boost/type_traits/detail/yes_no_type.hpp>
-#if defined(BOOST_NO_NULLPTR)
-
-#define TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
+#define BOOST_TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
template<class T> \
- struct BOOST_PP_CAT(trait,_detail) \
+ struct BOOST_PP_CAT(trait,_detail_hcmf) \
{ \
template<class F> \
- struct class_type \
- { \
- typedef typename \
+ struct cl_type : \
boost::remove_const \
< \
- typename \
- boost::mpl::at \
- < \
- typename \
- boost::function_types::parameter_types \
- < \
- F, \
- boost::mpl::quote1 \
- < \
- boost::mpl::identity \
- > \
- > \
- ::type, \
- boost::mpl::int_<0> \
- >::type \
- >::type \
- type; \
- }; \
- \
- template<T> \
- struct helper; \
- \
- template<class U> \
- static ::boost::type_traits::yes_type check(helper<&U::name> *); \
- \
- template<class U> \
- static ::boost::type_traits::no_type check(...); \
- \
- BOOST_STATIC_CONSTANT(bool,value=sizeof(check<typename class_type<T>::type>(0))==sizeof(::boost::type_traits::yes_type)); \
- \
- typedef boost::mpl::bool_<value> type; \
- }; \
-/**/
-
-#else // !defined(BOOST_NO_NULLPTR)
-
-#define TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
- template<class T> \
- struct BOOST_PP_CAT(trait,_detail) \
- { \
- template<class F> \
- struct class_type \
+ typename BOOST_TTI_NAMESPACE::detail::class_type<F>::type \
+ > \
{ \
- typedef typename \
- boost::remove_const \
- < \
- typename \
- boost::mpl::at \
- < \
- typename \
- boost::function_types::parameter_types \
- < \
- F, \
- boost::mpl::quote1 \
- < \
- boost::mpl::identity \
- > \
- > \
- ::type, \
- boost::mpl::int_<0> \
- >::type \
- >::type \
- type; \
}; \
\
template<T> \
@@ -104,12 +38,10 @@
template<class U> \
static ::boost::type_traits::no_type check(...); \
\
- BOOST_STATIC_CONSTANT(bool,value=sizeof(check<typename class_type<T>::type>(nullptr))==sizeof(::boost::type_traits::yes_type)); \
+ BOOST_STATIC_CONSTANT(bool,value=sizeof(check<typename cl_type<T>::type>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type)); \
\
typedef boost::mpl::bool_<value> type; \
}; \
/**/
-#endif // defined(BOOST_NO_NULLPTR)
-
-#endif // TTI_DETAIL_COMP_MEM_FUN_HPP
+#endif // BOOST_TTI_DETAIL_COMP_MEM_FUN_HPP
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 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -1,42 +1,20 @@
-// (C) Copyright Edward Diener 2011
+// (C) Copyright Edward Diener 2011,2012
// 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).
-#if !defined(TTI_DETAIL_COMP_STATIC_MEM_FUN_HPP)
-#define TTI_DETAIL_COMP_STATIC_MEM_FUN_HPP
+#if !defined(BOOST_TTI_DETAIL_COMP_STATIC_MEM_FUN_HPP)
+#define BOOST_TTI_DETAIL_COMP_STATIC_MEM_FUN_HPP
#include <boost/config.hpp>
#include <boost/function_types/is_function.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/type_traits/detail/yes_no_type.hpp>
+#include <boost/tti/detail/dnullptr.hpp>
-#if defined(BOOST_NO_NULLPTR)
-
-#define TTI_DETAIL_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
- template<class T,class Type> \
- struct BOOST_PP_CAT(trait,_detail) \
- { \
- template<Type *> \
- struct helper; \
- \
- template<class U> \
- static ::boost::type_traits::yes_type check(helper<&U::name> *); \
- \
- template<class U> \
- static ::boost::type_traits::no_type check(...); \
- \
- BOOST_STATIC_CONSTANT(bool,value=(boost::function_types::is_function<Type>::value) && (sizeof(check<T>(0))==sizeof(::boost::type_traits::yes_type))); \
- \
- typedef boost::mpl::bool_<value> type; \
- }; \
-/**/
-
-#else // !defined(BOOST_NO_NULLPTR)
-
-#define TTI_DETAIL_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
+#define BOOST_TTI_DETAIL_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
template<class T,class Type> \
struct BOOST_PP_CAT(trait,_detail) \
{ \
@@ -49,12 +27,10 @@
template<class U> \
static ::boost::type_traits::no_type check(...); \
\
- BOOST_STATIC_CONSTANT(bool,value=(boost::function_types::is_function<Type>::value) && (sizeof(check<T>(nullptr))==sizeof(::boost::type_traits::yes_type))); \
+ BOOST_STATIC_CONSTANT(bool,value=(boost::function_types::is_function<Type>::value) && (sizeof(check<T>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type))); \
\
typedef boost::mpl::bool_<value> type; \
}; \
/**/
-#endif // defined(BOOST_NO_NULLPTR)
-
-#endif // TTI_DETAIL_COMP_STATIC_MEM_FUN_HPP
+#endif // BOOST_TTI_DETAIL_COMP_STATIC_MEM_FUN_HPP
Added: trunk/boost/tti/detail/ddeftype.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/tti/detail/ddeftype.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -0,0 +1,23 @@
+
+// (C) Copyright Edward Diener 2012
+// 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).
+
+#if !defined(TTI_DETAIL_DEFTYPE_HPP)
+#define TTI_DETAIL_DEFTYPE_HPP
+
+namespace boost
+ {
+ namespace tti
+ {
+ namespace detail
+ {
+ struct deftype
+ {
+ };
+ }
+ }
+ }
+
+#endif // TTI_DETAIL_DEFTYPE_HPP
Added: trunk/boost/tti/detail/dftclass.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/tti/detail/dftclass.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -0,0 +1,43 @@
+
+// (C) Copyright Edward Diener 2012
+// 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).
+
+#if !defined(BOOST_TTI_DETAIL_FTCLASS_HPP)
+#define BOOST_TTI_DETAIL_FTCLASS_HPP
+
+#include <boost/function_types/parameter_types.hpp>
+#include <boost/mpl/at.hpp>
+#include <boost/mpl/identity.hpp>
+#include <boost/mpl/int.hpp>
+#include <boost/mpl/quote.hpp>
+
+namespace boost
+ {
+ namespace tti
+ {
+ namespace detail
+ {
+ template<class F>
+ struct class_type :
+ boost::mpl::at
+ <
+ typename
+ boost::function_types::parameter_types
+ <
+ F,
+ boost::mpl::quote1
+ <
+ boost::mpl::identity
+ >
+ >::type,
+ boost::mpl::int_<0>
+ >
+ {
+ };
+ }
+ }
+ }
+
+#endif // BOOST_TTI_DETAIL_FTCLASS_HPP
Modified: trunk/boost/tti/detail/dmem_data.hpp
==============================================================================
--- trunk/boost/tti/detail/dmem_data.hpp (original)
+++ trunk/boost/tti/detail/dmem_data.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -8,18 +8,24 @@
#define TTI_DETAIL_MEM_DATA_HPP
#include <boost/config.hpp>
+#include <boost/function_types/components.hpp>
+#include <boost/function_types/is_member_object_pointer.hpp>
+#include <boost/mpl/assert.hpp>
#include <boost/mpl/bool.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
#include <boost/preprocessor/cat.hpp>
+#include <boost/tti/detail/ddeftype.hpp>
+#include <boost/tti/detail/dftclass.hpp>
+#include <boost/tti/gen/namespace_gen.hpp>
#include <boost/type_traits/detail/yes_no_type.hpp>
-#if !defined(BOOST_MSVC)
-#include <boost/tti/detail/dmem_fun.hpp>
-#endif
+#include <boost/type_traits/is_same.hpp>
#if defined(BOOST_MSVC)
-#define TTI_DETAIL_TRAIT_HAS_MEMBER_DATA(trait,name) \
+#define BOOST_TTI_DETAIL_TRAIT_HAS_MEMBER_DATA(trait,name) \
template<class T,class C> \
- struct BOOST_PP_CAT(trait,_detail) \
+ struct BOOST_PP_CAT(trait,_detail_hmd) \
{ \
template<class> \
struct return_of; \
@@ -73,8 +79,15 @@
#else // !defined(BOOST_MSVC)
-#define TTI_DETAIL_TRAIT_HAS_MEMBER_DATA(trait,name) \
- TTI_DETAIL_TRAIT_HAS_MEMBER_FUNCTION(trait,name) \
+#include <boost/tti/detail/dmem_fun.hpp>
+
+#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> \
+ struct BOOST_PP_CAT(trait,_detail_hmd) : \
+ BOOST_PP_CAT(trait,_detail_types)<T,C> \
+ { \
+ }; \
/**/
#endif // defined(BOOST_MSVC)
@@ -85,15 +98,49 @@
{
namespace detail
{
- template
- <
- class T,
- class R
- >
+
+ template<class T,class R>
struct ptmd
{
typedef R T::* type;
};
+
+ template<class T>
+ struct dmem_check_ptmd :
+ boost::mpl::identity<T>
+ {
+ BOOST_MPL_ASSERT((boost::function_types::is_member_object_pointer<T>));
+ };
+
+ template<class T>
+ struct dmem_check_ptec :
+ BOOST_TTI_NAMESPACE::detail::class_type<T>
+ {
+ BOOST_MPL_ASSERT((boost::function_types::is_member_object_pointer<T>));
+ };
+
+ template<class T,class 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>
+ >
+ {
+ };
+
+ template<class T,class 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>
+ >
+ {
+ };
+
}
}
}
Modified: trunk/boost/tti/detail/dmem_fun.hpp
==============================================================================
--- trunk/boost/tti/detail/dmem_fun.hpp (original)
+++ trunk/boost/tti/detail/dmem_fun.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -1,23 +1,34 @@
-// (C) Copyright Edward Diener 2011
+// (C) Copyright Edward Diener 2011,2012
// 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).
-#if !defined(TTI_DETAIL_MEM_FUN_HPP)
-#define TTI_DETAIL_MEM_FUN_HPP
+#if !defined(BOOST_TTI_DETAIL_MEM_FUN_HPP)
+#define BOOST_TTI_DETAIL_MEM_FUN_HPP
#include <boost/config.hpp>
+#include <boost/function_types/is_member_function_pointer.hpp>
+#include <boost/function_types/property_tags.hpp>
+#include <boost/mpl/and.hpp>
+#include <boost/mpl/logical.hpp>
+#include <boost/mpl/assert.hpp>
#include <boost/mpl/bool.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/vector.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/type_traits/detail/yes_no_type.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/type_traits/remove_const.hpp>
+#include <boost/tti/detail/dcomp_mem_fun.hpp>
+#include <boost/tti/detail/ddeftype.hpp>
+#include <boost/tti/detail/dnullptr.hpp>
#include <boost/tti/detail/dptmf.hpp>
+#include <boost/tti/gen/namespace_gen.hpp>
-#if defined(BOOST_NO_NULLPTR)
-
-#define TTI_DETAIL_TRAIT_HAS_MEMBER_FUNCTION(trait,name) \
+#define BOOST_TTI_DETAIL_TRAIT_HAS_TYPES_MEMBER_FUNCTION(trait,name) \
template<class T,class C> \
- struct BOOST_PP_CAT(trait,_detail) \
+ struct BOOST_PP_CAT(trait,_detail_types) \
{ \
template<T> \
struct helper; \
@@ -28,33 +39,43 @@
template<class U> \
static ::boost::type_traits::no_type check(...); \
\
- BOOST_STATIC_CONSTANT(bool,value=sizeof(check<C>(0))==sizeof(::boost::type_traits::yes_type)); \
+ BOOST_STATIC_CONSTANT(bool,value=sizeof(check<C>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type)); \
\
typedef boost::mpl::bool_<value> type; \
}; \
/**/
-#else // !defined(BOOST_NO_NULLPTR)
+#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> \
+ struct BOOST_PP_CAT(trait,_detail_check_comp) : \
+ BOOST_PP_CAT(trait,_detail_hcmf)<TTI_T> \
+ { \
+ BOOST_MPL_ASSERT((boost::function_types::is_member_function_pointer<TTI_T>)); \
+ }; \
+/**/
-#define TTI_DETAIL_TRAIT_HAS_MEMBER_FUNCTION(trait,name) \
- template<class T,class C> \
- struct BOOST_PP_CAT(trait,_detail) \
+#define BOOST_TTI_DETAIL_TRAIT_HAS_MEMBER_FUNCTION(trait,name) \
+ BOOST_TTI_DETAIL_TRAIT_HAS_TYPES_MEMBER_FUNCTION(trait,name) \
+ BOOST_TTI_DETAIL_TRAIT_CHECK_HAS_COMP_MEMBER_FUNCTION(trait,name) \
+ template<class TTI_T,class TTI_R,class TTI_FS,class TTI_TAG> \
+ struct BOOST_PP_CAT(trait,_detail_hmf) \
{ \
- template<T> \
- struct helper; \
- \
- template<class U> \
- static ::boost::type_traits::yes_type check(helper<&U::name> *); \
- \
- template<class U> \
- static ::boost::type_traits::no_type check(...); \
- \
- BOOST_STATIC_CONSTANT(bool,value=sizeof(check<C>(nullptr))==sizeof(::boost::type_traits::yes_type)); \
+ typedef typename \
+ boost::mpl::eval_if \
+ < \
+ boost::mpl::and_ \
+ < \
+ boost::is_same<TTI_R,BOOST_TTI_NAMESPACE::detail::deftype>, \
+ boost::is_same<TTI_FS,boost::mpl::vector<> >, \
+ boost::is_same<TTI_TAG,boost::function_types::null_tag> \
+ >, \
+ BOOST_PP_CAT(trait,_detail_check_comp)<TTI_T>, \
+ BOOST_PP_CAT(trait,_detail_types)<typename BOOST_TTI_NAMESPACE::detail::ptmf_seq<TTI_T,TTI_R,TTI_FS,TTI_TAG>::type,typename boost::remove_const<TTI_T>::type> \
+ >::type type; \
\
- typedef boost::mpl::bool_<value> type; \
+ BOOST_STATIC_CONSTANT(bool,value=type::value); \
}; \
/**/
-#endif // defined(BOOST_NO_NULLPTR)
-
-#endif // TTI_DETAIL_MEM_FUN_HPP
+#endif // BOOST_TTI_DETAIL_MEM_FUN_HPP
Modified: trunk/boost/tti/detail/dmem_type.hpp
==============================================================================
--- trunk/boost/tti/detail/dmem_type.hpp (original)
+++ trunk/boost/tti/detail/dmem_type.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -4,14 +4,14 @@
// 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_MEM_TYPE_HPP)
-#define TTI_DETAIL_MEM_TYPE_HPP
+#if !defined(BOOST_TTI_DETAIL_MEM_TYPE_HPP)
+#define BOOST_TTI_DETAIL_MEM_TYPE_HPP
#include <boost/config.hpp>
#include <boost/mpl/has_xxx.hpp>
#include <boost/preprocessor/cat.hpp>
-#define TTI_DETAIL_TRAIT_HAS_TYPE_MEMBER_TYPE(trait,name) \
+#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> \
struct BOOST_PP_CAT(trait,_detail) \
@@ -22,7 +22,7 @@
}; \
/**/
-#define TTI_DETAIL_TRAIT_MEMBER_TYPE(trait,name) \
+#define BOOST_TTI_DETAIL_TRAIT_MEMBER_TYPE(trait,name) \
template<class T> \
struct BOOST_PP_CAT(trait,_detail_member_type) \
{ \
@@ -30,4 +30,4 @@
}; \
/**/
-#endif // TTI_DETAIL_MEM_TYPE_HPP
+#endif // BOOST_TTI_DETAIL_MEM_TYPE_HPP
Added: trunk/boost/tti/detail/dnullptr.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/tti/detail/dnullptr.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -0,0 +1,22 @@
+
+// (C) Copyright Edward Diener 2012
+// 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).
+
+#if !defined(BOOST_TTI_DETAIL_NULLPTR_HPP)
+#define BOOST_TTI_DETAIL_NULLPTR_HPP
+
+#include <boost/config.hpp>
+
+#if defined(BOOST_NO_NULLPTR)
+
+#define BOOST_TTI_DETAIL_NULLPTR 0
+
+#else // !BOOST_NO_NULLPTR
+
+#define BOOST_TTI_DETAIL_NULLPTR nullptr
+
+#endif // BOOST_NO_NULLPTR
+
+#endif // BOOST_TTI_DETAIL_NULLPTR_HPP
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 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -4,18 +4,19 @@
// 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_STATIC_MEM_DATA_HPP)
-#define TTI_DETAIL_STATIC_MEM_DATA_HPP
+#if !defined(BOOST_TTI_DETAIL_STATIC_MEM_DATA_HPP)
+#define BOOST_TTI_DETAIL_STATIC_MEM_DATA_HPP
#include <boost/config.hpp>
#include <boost/function_types/is_function.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/type_traits/detail/yes_no_type.hpp>
+#include <boost/tti/detail/dnullptr.hpp>
#if defined(BOOST_MSVC)
-#define TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
+#define BOOST_TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
template<class T,class Type> \
struct BOOST_PP_CAT(trait,_detail) \
{ \
@@ -61,30 +62,7 @@
#else // !defined(BOOST_MSVC)
-#if defined(BOOST_NO_NULLPTR)
-
-#define TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
- template<class T,class Type> \
- struct BOOST_PP_CAT(trait,_detail) \
- { \
- template<Type *> \
- struct helper; \
- \
- template<class U> \
- static ::boost::type_traits::yes_type check(helper<&U::name> *); \
- \
- template<class U> \
- static ::boost::type_traits::no_type check(...); \
- \
- BOOST_STATIC_CONSTANT(bool,value=(!boost::function_types::is_function<Type>::value) && (sizeof(check<T>(0))==sizeof(::boost::type_traits::yes_type))); \
- \
- typedef boost::mpl::bool_<value> type; \
- }; \
-/**/
-
-#else // !defined(BOOST_NO_NULLPTR)
-
-#define TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
+#define BOOST_TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
template<class T,class Type> \
struct BOOST_PP_CAT(trait,_detail) \
{ \
@@ -97,14 +75,12 @@
template<class U> \
static ::boost::type_traits::no_type check(...); \
\
- BOOST_STATIC_CONSTANT(bool,value=(!boost::function_types::is_function<Type>::value) && (sizeof(check<T>(nullptr))==sizeof(::boost::type_traits::yes_type))); \
+ BOOST_STATIC_CONSTANT(bool,value=(!boost::function_types::is_function<Type>::value) && (sizeof(check<T>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type))); \
\
typedef boost::mpl::bool_<value> type; \
}; \
/**/
-#endif // defined(BOOST_NO_NULLPTR)
-
#endif // defined(BOOST_MSVC)
-#endif // TTI_DETAIL_STATIC_MEM_DATA_HPP
+#endif // BOOST_TTI_DETAIL_STATIC_MEM_DATA_HPP
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 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -4,15 +4,14 @@
// 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_STATIC_MEM_FUN_HPP)
-#define TTI_DETAIL_STATIC_MEM_FUN_HPP
+#if !defined(BOOST_TTI_DETAIL_STATIC_MEM_FUN_HPP)
+#define BOOST_TTI_DETAIL_STATIC_MEM_FUN_HPP
#include <boost/config.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/type_traits/detail/yes_no_type.hpp>
-
-#if defined(BOOST_NO_NULLPTR)
+#include <boost/tti/detail/dnullptr.hpp>
#define TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_FUNCTION(trait,name) \
template<class T,class Type> \
@@ -27,33 +26,10 @@
template<class U> \
static ::boost::type_traits::no_type check(...); \
\
- BOOST_STATIC_CONSTANT(bool,value=sizeof(check<T>(0))==sizeof(::boost::type_traits::yes_type)); \
+ BOOST_STATIC_CONSTANT(bool,value=sizeof(check<T>(BOOST_TTI_DETAIL_NULLPTR))==sizeof(::boost::type_traits::yes_type)); \
\
typedef boost::mpl::bool_<value> type; \
}; \
/**/
-#else // !defined(BOOST_NO_NULLPTR)
-
-#define TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_FUNCTION(trait,name) \
- template<class T,class Type> \
- struct BOOST_PP_CAT(trait,_detail) \
- { \
- template<Type *> \
- struct helper; \
- \
- template<class U> \
- static ::boost::type_traits::yes_type check(helper<&U::name> *); \
- \
- template<class U> \
- static ::boost::type_traits::no_type check(...); \
- \
- BOOST_STATIC_CONSTANT(bool,value=sizeof(check<T>(nullptr))==sizeof(::boost::type_traits::yes_type)); \
- \
- typedef boost::mpl::bool_<value> type; \
- }; \
-/**/
-
-#endif // defined(BOOST_NO_NULLPTR)
-
-#endif // TTI_DETAIL_STATIC_MEM_FUN_HPP
+#endif // BOOST_TTI_DETAIL_STATIC_MEM_FUN_HPP
Modified: trunk/boost/tti/detail/dtype.hpp
==============================================================================
--- trunk/boost/tti/detail/dtype.hpp (original)
+++ trunk/boost/tti/detail/dtype.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -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_TYPE_HPP)
-#define TTI_DETAIL_TYPE_HPP
+#if !defined(BOOST_TTI_DETAIL_TYPE_HPP)
+#define BOOST_TTI_DETAIL_TYPE_HPP
#include <boost/config.hpp>
#include <boost/mpl/bool.hpp>
@@ -16,7 +16,7 @@
#include <boost/type_traits/is_same.hpp>
#include <boost/tti/detail/dnotype.hpp>
-#define TTI_DETAIL_TRAIT_HAS_TYPE(trait,name) \
+#define BOOST_TTI_DETAIL_TRAIT_HAS_TYPE(trait,name) \
BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(BOOST_PP_CAT(trait,_detail_mpl), name, false) \
template<class T,class U,class B> \
struct BOOST_PP_CAT(trait,_detail) \
@@ -27,8 +27,7 @@
boost::is_same<typename T::name,U>, \
boost::mpl::true_, \
boost::mpl::false_ \
- >::type \
- type; \
+ >::type type; \
BOOST_STATIC_CONSTANT(bool,value=type::value); \
}; \
\
@@ -47,4 +46,4 @@
}; \
/**/
-#endif // TTI_DETAIL_TYPE_HPP
+#endif // BOOST_TTI_DETAIL_TYPE_HPP
Modified: trunk/boost/tti/has_member_data.hpp
==============================================================================
--- trunk/boost/tti/has_member_data.hpp (original)
+++ trunk/boost/tti/has_member_data.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -7,12 +7,12 @@
#if !defined(TTI_HAS_MEMBER_DATA_HPP)
#define TTI_HAS_MEMBER_DATA_HPP
-#include <boost/config.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/type_traits/remove_const.hpp>
#include <boost/tti/gen/has_member_data_gen.hpp>
#include <boost/tti/gen/namespace_gen.hpp>
#include <boost/tti/detail/dmem_data.hpp>
+#include <boost/tti/detail/ddeftype.hpp>
/*
@@ -26,7 +26,7 @@
/// Expands to a metafunction which tests whether a member data with a particular name and type exists.
/**
- trait = the name of the metafunction within the tti namespace.
+ trait = the name of the metafunction.
name = the name of the inner member to introspect.
@@ -50,10 +50,17 @@
*/
#define BOOST_TTI_TRAIT_HAS_MEMBER_DATA(trait,name) \
- TTI_DETAIL_TRAIT_HAS_MEMBER_DATA(trait,name) \
- template<class TTI_T,class TTI_Type> \
+ BOOST_TTI_DETAIL_TRAIT_HAS_MEMBER_DATA(trait,name) \
+ template<class TTI_T,class TTI_Type = BOOST_TTI_NAMESPACE::detail::deftype> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<typename BOOST_TTI_NAMESPACE::detail::ptmd<TTI_T,TTI_Type>::type,typename boost::remove_const<TTI_T>::type> \
+ BOOST_PP_CAT(trait,_detail_hmd) \
+ < \
+ typename BOOST_TTI_NAMESPACE::detail::dmem_get_type<TTI_T,TTI_Type>::type, \
+ typename boost::remove_const \
+ < \
+ typename BOOST_TTI_NAMESPACE::detail::dmem_get_enclosing<TTI_T,TTI_Type>::type \
+ >::type \
+ > \
{ \
}; \
/**/
Modified: trunk/boost/tti/has_member_function.hpp
==============================================================================
--- trunk/boost/tti/has_member_function.hpp (original)
+++ trunk/boost/tti/has_member_function.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -1,20 +1,19 @@
-// (C) Copyright Edward Diener 2011
+// (C) Copyright Edward Diener 2011,2012
// 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).
-#if !defined(TTI_HAS_MEMBER_FUNCTION_HPP)
-#define TTI_HAS_MEMBER_FUNCTION_HPP
+#if !defined(BOOST_TTI_HAS_MEMBER_FUNCTION_HPP)
+#define BOOST_TTI_HAS_MEMBER_FUNCTION_HPP
-#include <boost/config.hpp>
#include <boost/function_types/property_tags.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/preprocessor/cat.hpp>
-#include <boost/type_traits/remove_const.hpp>
#include <boost/tti/gen/has_member_function_gen.hpp>
-#include <boost/tti/gen/namespace_gen.hpp>
+#include <boost/tti/detail/ddeftype.hpp>
#include <boost/tti/detail/dmem_fun.hpp>
+#include <boost/tti/gen/namespace_gen.hpp>
/*
@@ -59,10 +58,10 @@
*/
#define BOOST_TTI_TRAIT_HAS_MEMBER_FUNCTION(trait,name) \
- TTI_DETAIL_TRAIT_HAS_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> \
+ 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> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<typename BOOST_TTI_NAMESPACE::detail::ptmf_seq<TTI_T,TTI_R,TTI_FS,TTI_TAG>::type,typename boost::remove_const<TTI_T>::type> \
+ BOOST_PP_CAT(trait,_detail_hmf)<TTI_T,TTI_R,TTI_FS,TTI_TAG> \
{ \
}; \
/**/
@@ -106,4 +105,4 @@
) \
/**/
-#endif // TTI_HAS_MEMBER_FUNCTION_HPP
+#endif // BOOST_TTI_HAS_MEMBER_FUNCTION_HPP
Modified: trunk/boost/tti/has_member_function_with_sig.hpp
==============================================================================
--- trunk/boost/tti/has_member_function_with_sig.hpp (original)
+++ trunk/boost/tti/has_member_function_with_sig.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -4,12 +4,10 @@
// 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_MEMBER_FUNCTION_WITH_SIG_HPP)
-#define TTI_HAS_MEMBER_FUNCTION_WITH_SIG_HPP
+#if !defined(BOOST_TTI_HAS_MEMBER_FUNCTION_WITH_SIG_HPP)
+#define BOOST_TTI_HAS_MEMBER_FUNCTION_WITH_SIG_HPP
#include <boost/config.hpp>
-#include <boost/mpl/apply.hpp>
-#include <boost/mpl/identity.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/tti/gen/has_member_function_with_sig_gen.hpp>
#include <boost/tti/detail/dcomp_mem_fun.hpp>
@@ -51,10 +49,10 @@
*/
#define BOOST_TTI_TRAIT_HAS_MEMBER_FUNCTION_WITH_SIG(trait,name) \
- TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
+ BOOST_TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
template<class TTI_T> \
struct trait : \
- BOOST_PP_CAT(trait,_detail)<TTI_T> \
+ BOOST_PP_CAT(trait,_detail_hcmf)<TTI_T> \
{ \
}; \
/**/
@@ -92,4 +90,4 @@
) \
/**/
-#endif // TTI_HAS_MEMBER_FUNCTION_WITH_SIG_HPP
+#endif // BOOST_TTI_HAS_MEMBER_FUNCTION_WITH_SIG_HPP
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 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -45,7 +45,7 @@
*/
#define BOOST_TTI_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
- TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
+ BOOST_TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER_DATA(trait,name) \
template<class TTI_T,class TTI_Type> \
struct trait : \
BOOST_PP_CAT(trait,_detail)<TTI_T,TTI_Type> \
Modified: trunk/boost/tti/has_static_member_function_with_sig.hpp
==============================================================================
--- trunk/boost/tti/has_static_member_function_with_sig.hpp (original)
+++ trunk/boost/tti/has_static_member_function_with_sig.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -54,7 +54,7 @@
*/
#define BOOST_TTI_TRAIT_HAS_STATIC_MEMBER_FUNCTION_WITH_SIG(trait,name) \
- TTI_DETAIL_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
+ BOOST_TTI_DETAIL_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
template<class TTI_T,class TTI_Type> \
struct trait : \
BOOST_PP_CAT(trait,_detail)<TTI_T,TTI_Type> \
Modified: trunk/boost/tti/has_template.hpp
==============================================================================
--- trunk/boost/tti/has_template.hpp (original)
+++ trunk/boost/tti/has_template.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -31,6 +31,85 @@
#include <boost/preprocessor/variadic/size.hpp>
#include <boost/tti/detail/dvm_template_params.hpp>
+/// Expands to a metafunction which tests whether an inner class template with a particular name exists.
+/**
+
+ trait = the name of the metafunction.
+ ... = variadic paramaters.
+
+ The first variadic parameter is the inner class template name.
+
+ Following variadic parameters are optional.
+
+ If no following variadic parameters exist, then the inner class template
+ being introspected must be all template type parameters ( template parameters
+ starting with `class` or `typename` ) and any number of template type parameters
+ can occur.
+
+ If the second variadic parameter is BOOST_PP_NIL and no other variadic
+ parameter is given, then just as in the previous case the inner class template
+ being introspected must be all template type parameters ( template parameters
+ starting with `class` or `typename` ) and any number of template type parameters
+ can occur. This form is allowed in order to be consistent with using the
+ non-variadic form of this macro.
+
+ If the second variadic parameter is a Boost preprocessor library array and no other
+ variadic parameter is given, then the inner class template must have its template
+ parameters matching the sequence in the tuple portion of the Boost PP array. This
+ form is allowed in order to be consistent with using the non-variadic form of this
+ macro.
+
+ Otherwise the inner class template must have its template parameters matching the
+ sequence of the optional variadic parameters.
+
+ generates a metafunction called "trait" where 'trait' is the first macro parameter.
+
+ template<class TTI_T>
+ struct trait
+ {
+ static const value = unspecified;
+ typedef mpl::bool_<true-or-false> type;
+ };
+
+ The metafunction types and return:
+
+ TTI_T = the enclosing type in which to look for our 'name'.
+
+ returns = 'value' is true if the 'name' template exists within the enclosing type,
+ otherwise 'value' is false.
+
+ Examples:
+
+ 1) Search for an inner class template called 'MyTemplate', with all template type parameters,
+ nested within the class 'MyClass' using a metafunction name of 'MyMeta'.
+
+ BOOST_TTI_TRAIT_HAS_TEMPLATE(MyMeta,MyTemplate)
+
+ or
+
+ BOOST_TTI_TRAIT_HAS_TEMPLATE(MyMeta,MyTemplate,BOOST_PP_NIL) // Non-variadic macro form
+
+ MyMeta<MyClass>::value
+
+ is a compile time boolean constant which is either 'true' or 'false'
+ if the nested template exists.
+
+ 2) Search for an inner class template called 'MyTemplate', with template parameters
+ of 'class T,int x,template<class> class U', nested within the class 'MyClass'
+ using a metafunction name of 'MyMeta'.
+
+ BOOST_TTI_TRAIT_HAS_TEMPLATE(MyMeta,MyTemplate,class,int,template<class> class)
+
+ or
+
+ BOOST_TTI_TRAIT_HAS_TEMPLATE(MyMeta,MyTemplate,(3,(class,int,template<class> class))) // Non-variadic macro form
+
+ MyMeta<MyClass>::value
+
+ is a compile time boolean constant which is either 'true' or 'false'
+ if the nested template exists.
+
+*/
#define BOOST_TTI_TRAIT_HAS_TEMPLATE(trait,...) \
BOOST_PP_IIF \
( \
@@ -45,6 +124,83 @@
(trait,__VA_ARGS__) \
/**/
+/// Expands to a metafunction which tests whether an inner class template with a particular name exists.
+/**
+
+ ... = variadic paramaters.
+
+ The first variadic parameter is the inner class template name.
+
+ Following variadic parameters are optional.
+
+ If no following variadic parameters exist, then the inner class template
+ being introspected must be all template type parameters ( template parameters
+ starting with `class` or `typename` ) and any number of template type parameters
+ can occur.
+
+ If the second variadic parameter is BOOST_PP_NIL and no other variadic
+ parameter is given, then just as in the previous case the inner class template
+ being introspected must be all template type parameters ( template parameters
+ starting with `class` or `typename` ) and any number of template type parameters
+ can occur. This form is allowed in order to be consistent with using the
+ non-variadic form of this macro.
+
+ If the second variadic parameter is a Boost preprocessor library array and no other
+ variadic parameter is given, then the inner class template must have its template
+ parameters matching the sequence in the tuple portion of the Boost PP array. This
+ form is allowed in order to be consistent with using the non-variadic form of this
+ macro.
+
+ Otherwise the inner class template must have its template parameters matching the
+ sequence of the optional variadic parameters.
+
+ generates a metafunction called "has_template_'name'" where 'name' is the first variadic parameter.
+
+ template<class TTI_T>
+ struct trait
+ {
+ static const value = unspecified;
+ typedef mpl::bool_<true-or-false> type;
+ };
+
+ The metafunction types and return:
+
+ TTI_T = the enclosing type in which to look for our 'name'.
+
+ returns = 'value' is true if the 'name' template exists within the enclosing type,
+ otherwise 'value' is false.
+
+ Examples:
+
+ 1) Search for an inner class template called 'MyTemplate', with all template type parameters,
+ nested within the class 'MyClass'.
+
+ BOOST_TTI_HAS_TEMPLATE(MyTemplate)
+
+ or
+
+ BOOST_TTI_HAS_TEMPLATE(MyTemplate,BOOST_PP_NIL) // Non-variadic macro form
+
+ has_template_MyTemplate<MyClass>::value
+
+ is a compile time boolean constant which is either 'true' or 'false'
+ if the nested template exists.
+
+ 2) Search for an inner class template called 'MyTemplate' with template parameters
+ of 'class T,int x,template<class> class U' nested within the class 'MyClass'.
+
+ BOOST_TTI_HAS_TEMPLATE(MyTemplate,class,int,template<class> class)
+
+ or
+
+ BOOST_TTI_HAS_TEMPLATE(MyTemplate,(3,(class,int,template<class> class))) // Non-variadic macro form
+
+ has_template_MyTemplate<MyClass>::value
+
+ is a compile time boolean constant which is either 'true' or 'false'
+ if the nested template exists.
+
+*/
#define BOOST_TTI_HAS_TEMPLATE(...) \
BOOST_TTI_TRAIT_HAS_TEMPLATE \
( \
Modified: trunk/boost/tti/has_type.hpp
==============================================================================
--- trunk/boost/tti/has_type.hpp (original)
+++ trunk/boost/tti/has_type.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -7,7 +7,6 @@
#if !defined(TTI_HAS_TYPE_HPP)
#define TTI_HAS_TYPE_HPP
-#include <boost/config.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/tti/gen/has_type_gen.hpp>
#include <boost/tti/gen/namespace_gen.hpp>
@@ -51,7 +50,7 @@
*/
#define BOOST_TTI_TRAIT_HAS_TYPE(trait,name) \
- TTI_DETAIL_TRAIT_HAS_TYPE(trait,name) \
+ BOOST_TTI_DETAIL_TRAIT_HAS_TYPE(trait,name) \
template<class TTI_T,class TTI_U = BOOST_TTI_NAMESPACE::detail::notype> \
struct trait : \
BOOST_PP_CAT(trait,_detail) \
Modified: trunk/boost/tti/member_type.hpp
==============================================================================
--- trunk/boost/tti/member_type.hpp (original)
+++ trunk/boost/tti/member_type.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -56,8 +56,8 @@
*/
#define BOOST_TTI_TRAIT_MEMBER_TYPE(trait,name) \
- TTI_DETAIL_TRAIT_HAS_TYPE_MEMBER_TYPE(trait,name) \
- TTI_DETAIL_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> \
struct trait : \
boost::mpl::eval_if \
Modified: trunk/boost/tti/tti.hpp
==============================================================================
--- trunk/boost/tti/tti.hpp (original)
+++ trunk/boost/tti/tti.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -14,16 +14,7 @@
#include "has_static_member_function.hpp"
#include "has_static_member_function_with_sig.hpp"
#include "has_template.hpp"
-#include "has_template_check_params.hpp"
#include "has_type.hpp"
#include "member_type.hpp"
-#include "mf/mf_has_member_data.hpp"
-#include "mf/mf_has_member_function.hpp"
-#include "mf/mf_has_static_member_data.hpp"
-#include "mf/mf_has_static_member_function.hpp"
-#include "mf/mf_has_template.hpp"
-#include "mf/mf_has_template_check_params.hpp"
-#include "mf/mf_has_type.hpp"
-#include "mf/mf_member_type.hpp"
#endif // TT_INTROSPECTION_HPP
Modified: trunk/boost/tti/vm_has_template_check_params.hpp
==============================================================================
--- trunk/boost/tti/vm_has_template_check_params.hpp (original)
+++ trunk/boost/tti/vm_has_template_check_params.hpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -13,6 +13,7 @@
#if BOOST_PP_VARIADICS
+#include <boost/config.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/tti/gen/vm_has_template_check_params_gen.hpp>
#include <boost/tti/detail/dvm_template_params.hpp>
Modified: trunk/libs/tti/test/Jamfile.v2
==============================================================================
--- trunk/libs/tti/test/Jamfile.v2 (original)
+++ trunk/libs/tti/test/Jamfile.v2 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -30,6 +30,7 @@
alias ttimd
:
[ run test_has_mem_data.cpp ]
+ [ run test_has_mem_data2.cpp ]
[ compile test_has_mem_data_compile.cpp ]
[ compile-fail test_has_mem_data_fail.cpp ]
[ compile-fail test_has_mem_data_fail2.cpp ]
@@ -38,7 +39,7 @@
alias ttimfn
:
- [ run test_has_mem_fun.cpp ]
+ [ run test_has_mem_fun.cpp : : : <toolset>gcc-4.6.0:<cxxflags>-std=c++0x ]
[ compile test_has_mem_fun_compile.cpp ]
[ compile-fail test_has_mem_fun_fail.cpp ]
[ compile-fail test_has_mem_fun_fail2.cpp ]
Added: trunk/libs/tti/test/test_has_mem_data2.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/tti/test/test_has_mem_data2.cpp 2012-11-14 06:13:39 EST (Wed, 14 Nov 2012)
@@ -0,0 +1,26 @@
+
+// (C) Copyright Edward Diener 2012
+// 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).
+
+#include "test_has_mem_data.hpp"
+#include <boost/detail/lightweight_test.hpp>
+
+int main()
+ {
+
+ BOOST_TEST((BOOST_TTI_HAS_MEMBER_DATA_GEN(AnInt)<int AType::*>::value));
+ BOOST_TEST((BOOST_TTI_HAS_MEMBER_DATA_GEN(AnInt)<long AnotherType::*>::value));
+ BOOST_TEST((BOOST_TTI_HAS_MEMBER_DATA_GEN(aMember)<bool AnotherType::*>::value));
+ BOOST_TEST((!BOOST_TTI_HAS_MEMBER_DATA_GEN(aMember)<int AnotherType::*>::value));
+ BOOST_TEST((CMember<bool AnotherType::*>::value));
+ BOOST_TEST((!BOOST_TTI_HAS_MEMBER_DATA_GEN(someDataMember)<short AType::*>::value));
+ BOOST_TEST((BOOST_TTI_HAS_MEMBER_DATA_GEN(IntBT)<AType::BType AType::*>::value));
+ BOOST_TEST((NestedData<AType::BType::CType AType::*>::value));
+ BOOST_TEST((AOther<AType AnotherType::*>::value));
+ BOOST_TEST((BOOST_TTI_HAS_MEMBER_DATA_GEN(ONestStr)<AType::AStructType AnotherType::*>::value));
+
+ return boost::report_errors();
+
+ }
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