[Boost-commit] svn:boost r66706 - in sandbox/tti/boost/tti: . detail

Subject: [Boost-commit] svn:boost r66706 - in sandbox/tti/boost/tti: . detail
From: eldiener_at_[hidden]
Date: 2010-11-23 19:47:04

Author: eldiener
Date: 2010-11-23 19:47:03 EST (Tue, 23 Nov 2010)
New Revision: 66706
URL: http://svn.boost.org/trac/boost/changeset/66706

Log:
Fixed mf_has_member_function
Text files modified: 
   sandbox/tti/boost/tti/TTIntrospection.hpp              |    14 +++++++-------                          
   sandbox/tti/boost/tti/detail/TTIntrospectionDetail.hpp |    10 +++++++---                              
   2 files changed, 14 insertions(+), 10 deletions(-)

Modified: sandbox/tti/boost/tti/TTIntrospection.hpp
==============================================================================
--- sandbox/tti/boost/tti/TTIntrospection.hpp	(original)
+++ sandbox/tti/boost/tti/TTIntrospection.hpp	2010-11-23 19:47:03 EST (Tue, 23 Nov 2010)
@@ -45,7 +45,7 @@
   ) \
 /**/
 
-#define TTI_TRAIT_MEMBER_TYPE(trait,name) \
+#define TTI_MF_TRAIT_MEMBER_TYPE(trait,name) \
 namespace tti \
   { \
   namespace detail \
@@ -61,17 +61,17 @@
         < \
         tti::detail::trait<T>, \
         tti::detail::membertype::trait<T>, \
-        boost::mpl::identity<tti::detail::notype> \
+        tti::detail::notype \
         >::type \
     type; \
     }; \
   } \
 /**/
 
-#define TTI_MEMBER_TYPE(name) \
-  TTI_TRAIT_MEMBER_TYPE \
+#define TTI_MF_MEMBER_TYPE(name) \
+  TTI_MF_TRAIT_MEMBER_TYPE \
   ( \
-  BOOST_PP_CAT(member_type_,name), \
+  BOOST_PP_CAT(mf_member_type_,name), \
   name \
   ) \
 /**/
@@ -304,9 +304,9 @@
     class T,
     template<class> class HasMember,
     class R,
-    BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(TTI_MAX_PARAMETERS,class P,tti::detail::notype)
+    BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(TTI_MAX_PARAMETERS,class P,tti::detail::noparam)
     >
-  struct has_member_metafunction :
+  struct mf_has_member_function :
     tti::detail::eval
       <
       HasMember 

Modified: sandbox/tti/boost/tti/detail/TTIntrospectionDetail.hpp
==============================================================================
--- sandbox/tti/boost/tti/detail/TTIntrospectionDetail.hpp	(original)
+++ sandbox/tti/boost/tti/detail/TTIntrospectionDetail.hpp	2010-11-23 19:47:03 EST (Tue, 23 Nov 2010)
@@ -213,7 +213,11 @@
     {
     struct notype
       {
-      typedef notype type;
+      typedef tti::detail::notype type;
+      };
+    struct noparam
+      {
+      typedef tti::detail::noparam type;
       };
       
     template<class T>
@@ -227,12 +231,12 @@
       <
       class T,
       class R,
-      BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(TTI_MAX_PARAMETERS,class P,tti::detail::notype)
+      BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(TTI_MAX_PARAMETERS,class P,tti::detail::noparam)
       >
     struct ptmf  
       {
       typedef boost::mpl::vector<R,T,BOOST_PP_ENUM_PARAMS(TTI_MAX_PARAMETERS,P) > fseq;
-      typedef typename boost::mpl::remove<fseq,tti::detail::notype>::type ftseq;
+      typedef typename boost::mpl::remove<fseq,tti::detail::noparam>::type ftseq;
       typedef typename boost::function_types::member_function_pointer<ftseq>::type type;
       };
     }