Subject: [Boost-commit] svn:boost r69722 - in sandbox/tti: boost/tti boost/tti/detail libs/tti/doc libs/tti/test
From: eldiener_at_[hidden]
Date: 2011-03-08 14:27:04
Author: eldiener
Date: 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
New Revision: 69722
URL: http://svn.boost.org/trac/boost/changeset/69722
Log:
Updated composite names.
Text files modified:
sandbox/tti/boost/tti/comp_mem_fun.hpp | 26 +++++++++++++-------------
sandbox/tti/boost/tti/comp_static_mem_fun.hpp | 26 +++++++++++++-------------
sandbox/tti/boost/tti/detail/dcomp_mem_fun.hpp | 4 ++--
sandbox/tti/boost/tti/detail/dcomp_static_mem_fun.hpp | 14 +++++++-------
sandbox/tti/libs/tti/doc/tti_detail.qbk | 14 +++++++-------
sandbox/tti/libs/tti/doc/tti_history.qbk | 6 ++++--
sandbox/tti/libs/tti/doc/tti_meta_classes.qbk | 30 +++++++++++++++---------------
sandbox/tti/libs/tti/doc/tti_using_mm.qbk | 38 +++++++++++++++++++-------------------
sandbox/tti/libs/tti/test/test_has_member.cpp | 8 ++++----
sandbox/tti/libs/tti/test/test_has_member.hpp | 12 ++++++------
sandbox/tti/libs/tti/test/test_has_member_compile.cpp | 8 ++++----
sandbox/tti/libs/tti/test/test_has_member_fail.cpp | 2 +-
sandbox/tti/libs/tti/test/test_has_member_fail2.cpp | 2 +-
sandbox/tti/libs/tti/test/test_has_static_member.cpp | 2 +-
sandbox/tti/libs/tti/test/test_has_static_member.hpp | 8 ++++----
sandbox/tti/libs/tti/test/test_has_static_member_compile.cpp | 2 +-
sandbox/tti/libs/tti/test/test_has_static_member_fail2.cpp | 2 +-
17 files changed, 103 insertions(+), 101 deletions(-)
Modified: sandbox/tti/boost/tti/comp_mem_fun.hpp
==============================================================================
--- sandbox/tti/boost/tti/comp_mem_fun.hpp (original)
+++ sandbox/tti/boost/tti/comp_mem_fun.hpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -1,5 +1,5 @@
-#if !defined(TTI_MEMBER_HPP)
-#define TTI_MEMBER_HPP
+#if !defined(TTI_COMP_MEM_FUN_HPP)
+#define TTI_COMP_MEM_FUN_HPP
#include <boost/config.hpp>
#include <boost/mpl/apply.hpp>
@@ -34,14 +34,14 @@
otherwise 'value' is false.
*/
-#define BOOST_TTI_TRAIT_HAS_MEMBER(trait,name) \
+#define BOOST_TTI_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
namespace boost \
{ \
namespace tti \
{ \
namespace detail \
{ \
- TTI_DETAIL_TRAIT_HAS_MEMBER(trait,name) \
+ TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
} \
template<class T> \
struct trait : \
@@ -70,14 +70,14 @@
otherwise 'value' is false.
*/
-#define BOOST_TTI_MTFC_TRAIT_HAS_MEMBER(trait,name) \
+#define BOOST_TTI_MTFC_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
namespace boost \
{ \
namespace tti \
{ \
namespace detail \
{ \
- TTI_DETAIL_TRAIT_HAS_MEMBER(trait,name) \
+ TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
} \
struct trait \
{ \
@@ -107,10 +107,10 @@
otherwise 'value' is false.
*/
-#define BOOST_TTI_HAS_MEMBER(name) \
- BOOST_TTI_TRAIT_HAS_MEMBER \
+#define BOOST_TTI_HAS_COMP_MEMBER_FUNCTION(name) \
+ BOOST_TTI_TRAIT_HAS_COMP_MEMBER_FUNCTION \
( \
- BOOST_PP_CAT(has_member_,name), \
+ BOOST_PP_CAT(has_comp_member_function_,name), \
name \
) \
/**/
@@ -131,12 +131,12 @@
otherwise 'value' is false.
*/
-#define BOOST_TTI_MTFC_HAS_MEMBER(name) \
- BOOST_TTI_MTFC_TRAIT_HAS_MEMBER \
+#define BOOST_TTI_MTFC_HAS_COMP_MEMBER_FUNCTION(name) \
+ BOOST_TTI_MTFC_TRAIT_HAS_COMP_MEMBER_FUNCTION \
( \
- BOOST_PP_CAT(mtfc_has_member_,name), \
+ BOOST_PP_CAT(mtfc_has_comp_member_function_,name), \
name \
) \
/**/
-#endif // TTI_MEMBER_HPP
+#endif // TTI_COMP_MEM_FUN_HPP
Modified: sandbox/tti/boost/tti/comp_static_mem_fun.hpp
==============================================================================
--- sandbox/tti/boost/tti/comp_static_mem_fun.hpp (original)
+++ sandbox/tti/boost/tti/comp_static_mem_fun.hpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -1,5 +1,5 @@
-#if !defined(TTI_STATIC_MEMBER_HPP)
-#define TTI_STATIC_MEMBER_HPP
+#if !defined(TTI_COMP_STATIC_MEM_FUN_HPP)
+#define TTI_COMP_STATIC_MEM_FUN_HPP
#include <boost/config.hpp>
#include <boost/mpl/apply.hpp>
@@ -38,14 +38,14 @@
otherwise 'value' is false.
*/
-#define BOOST_TTI_TRAIT_HAS_STATIC_MEMBER(trait,name) \
+#define BOOST_TTI_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
namespace boost \
{ \
namespace tti \
{ \
namespace detail \
{ \
- TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER(trait,name) \
+ TTI_DETAIL_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
} \
template<class T,class Type> \
struct trait : \
@@ -78,14 +78,14 @@
otherwise 'value' is false.
*/
-#define BOOST_TTI_MTFC_TRAIT_HAS_STATIC_MEMBER(trait,name) \
+#define BOOST_TTI_MTFC_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
namespace boost \
{ \
namespace tti \
{ \
namespace detail \
{ \
- TTI_DETAIL_MTFC_TRAIT_HAS_STATIC_MEMBER(trait,name) \
+ TTI_DETAIL_MTFC_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
} \
struct trait \
{ \
@@ -120,10 +120,10 @@
otherwise 'value' is false.
*/
-#define BOOST_TTI_HAS_STATIC_MEMBER(name) \
- BOOST_TTI_TRAIT_HAS_STATIC_MEMBER \
+#define BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION(name) \
+ BOOST_TTI_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION \
( \
- BOOST_PP_CAT(has_static_member_,name), \
+ BOOST_PP_CAT(has_comp_static_member_function_,name), \
name \
) \
/**/
@@ -148,12 +148,12 @@
otherwise 'value' is false.
*/
-#define BOOST_TTI_MTFC_HAS_STATIC_MEMBER(name) \
- BOOST_TTI_MTFC_TRAIT_HAS_STATIC_MEMBER \
+#define BOOST_TTI_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION(name) \
+ BOOST_TTI_MTFC_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION \
( \
- BOOST_PP_CAT(mtfc_has_static_member_,name), \
+ BOOST_PP_CAT(mtfc_has_comp_static_member_function_,name), \
name \
) \
/**/
-#endif // TTI_STATIC_MEMBER_HPP
+#endif // TTI_COMP_STATIC_MEM_FUN_HPP
Modified: sandbox/tti/boost/tti/detail/dcomp_mem_fun.hpp
==============================================================================
--- sandbox/tti/boost/tti/detail/dcomp_mem_fun.hpp (original)
+++ sandbox/tti/boost/tti/detail/dcomp_mem_fun.hpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -13,7 +13,7 @@
#if defined(BOOST_NO_NULLPTR)
-#define TTI_DETAIL_TRAIT_HAS_MEMBER(trait,name) \
+#define TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
template<class T> \
struct trait \
{ \
@@ -59,7 +59,7 @@
#else // !defined(BOOST_NO_NULLPTR)
-#define TTI_DETAIL_TRAIT_HAS_MEMBER(trait,name) \
+#define TTI_DETAIL_TRAIT_HAS_COMP_MEMBER_FUNCTION(trait,name) \
template<class T> \
struct trait \
{ \
Modified: sandbox/tti/boost/tti/detail/dcomp_static_mem_fun.hpp
==============================================================================
--- sandbox/tti/boost/tti/detail/dcomp_static_mem_fun.hpp (original)
+++ sandbox/tti/boost/tti/detail/dcomp_static_mem_fun.hpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -1,5 +1,5 @@
-#if !defined(TTI_DETAIL_STATIC_MEM_HPP)
-#define TTI_DETAIL_STATIC_MEM_HPP
+#if !defined(TTI_DETAIL_COMP_STATIC_MEM_FUN_HPP)
+#define TTI_DETAIL_COMP_STATIC_MEM_FUN_HPP
#include <boost/config.hpp>
#include <boost/function_types/is_function.hpp>
@@ -8,7 +8,7 @@
#if defined(BOOST_NO_NULLPTR)
-#define TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER(trait,name) \
+#define TTI_DETAIL_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
template<class T,class Type> \
struct trait \
{ \
@@ -27,7 +27,7 @@
}; \
/**/
-#define TTI_DETAIL_MTFC_TRAIT_HAS_STATIC_MEMBER(trait,name) \
+#define TTI_DETAIL_MTFC_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
struct trait \
{ \
template<class T,class Type> \
@@ -51,7 +51,7 @@
#else // !defined(BOOST_NO_NULLPTR)
-#define TTI_DETAIL_TRAIT_HAS_STATIC_MEMBER(trait,name) \
+#define TTI_DETAIL_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
template<class T,class Type> \
struct trait \
{ \
@@ -70,7 +70,7 @@
}; \
/**/
-#define TTI_DETAIL_MTFC_TRAIT_HAS_STATIC_MEMBER(trait,name) \
+#define TTI_DETAIL_MTFC_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(trait,name) \
struct trait \
{ \
template<class T,class Type> \
@@ -94,4 +94,4 @@
#endif // defined(BOOST_NO_NULLPTR)
-#endif // TTI_DETAIL_STATIC_MEM_HPP
+#endif // TTI_DETAIL_COMP_STATIC_MEM_FUN_HPP
Modified: sandbox/tti/libs/tti/doc/tti_detail.qbk
==============================================================================
--- sandbox/tti/libs/tti/doc/tti_detail.qbk (original)
+++ sandbox/tti/libs/tti/doc/tti_detail.qbk 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -132,14 +132,14 @@
[
[Member function as a composite type]
[
- [macroref BOOST_TTI_HAS_MEMBER](name)
+ [macroref BOOST_TTI_HAS_COMP_MEMBER_FUNCTION](name)
]
[
- boost::tti::has\_member\_'name'
+ boost::tti::has\_comp\_member\_function\_'name'
- class T = pointer to data or function member
+ class T = pointer to member function
- The form for T is 'ReturnType (Class::*)(Zero or more comma-separated parameter types)' for member function
+ The form for T is 'ReturnType (Class::*)(Zero or more comma-separated parameter types)'
]
[[headerref boost/tti/comp_mem_fun.hpp comp\_mem\_fun.hpp]]
]
@@ -181,16 +181,16 @@
[
[Static member function as a composite type]
[
- [macroref BOOST_TTI_HAS_STATIC_MEMBER](name)
+ [macroref BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION](name)
]
[
- boost::tti::has\_static\_member\_'name'
+ boost::tti::has\_comp\_static\_member\_function\_'name'
class T = enclosing type
class Type = function type
- The form for Type is 'ReturnType (Zero or more comma-separated parameter types)' as a function type
+ The form for Type is 'ReturnType (Zero or more comma-separated parameter types)'
]
[[headerref boost/tti/comp_static_mem_fun.hpp comp\_static\_mem\_fun.hpp]]
]
Modified: sandbox/tti/libs/tti/doc/tti_history.qbk
==============================================================================
--- sandbox/tti/libs/tti/doc/tti_history.qbk (original)
+++ sandbox/tti/libs/tti/doc/tti_history.qbk 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -3,8 +3,10 @@
[heading Version 1.4]
* Breaking changes
- * BOOST_TTI_HAS_STATIC_MEMBER and family supports only composite static member functions.
- * BOOST_TTI_HAS_MEMBER and family supports only composite member functions.
+ * BOOST\_TTI\_HAS\_MEMBER has been changed to BOOST\_TTI\_HAS\_COMP_MEMBER\_FUNCTION.
+ It now supports only member functions with composite syntax.
+ * BOOST\_TTI\_HAS\_STATIC\_MEMBER has been changed to BOOST\_TTI\_HAS\_COMP\_STATIC\_MEMBER\_FUNCTION.
+ It now supports only static member functions with composite syntax.
* Added BOOST_TTI_HAS_STATIC_MEMBER_DATA and family for introspecting static member data.
* Inclusion of specific header files for faster compilation is now supported.
* Shorten the names of the test files and test header files.
Modified: sandbox/tti/libs/tti/doc/tti_meta_classes.qbk
==============================================================================
--- sandbox/tti/libs/tti/doc/tti_meta_classes.qbk (original)
+++ sandbox/tti/libs/tti/doc/tti_meta_classes.qbk 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -85,16 +85,6 @@
[boost::tti::'trait']
]
[
- [[macroref BOOST_TTI_HAS_MEMBER]]
- [[macroref BOOST_TTI_MTFC_HAS_MEMBER]]
- [boost::tti::mtfc\_has\_member\_'name']
- ]
- [
- [[macroref BOOST_TTI_TRAIT_HAS_MEMBER]]
- [[macroref BOOST_TTI_MTFC_TRAIT_HAS_MEMBER]]
- [boost::tti::'trait']
- ]
- [
[[macroref BOOST_TTI_HAS_MEMBER_DATA]]
[[macroref BOOST_TTI_MTFC_HAS_MEMBER_DATA]]
[boost::tti::mtfc\_has\_member\_data\_'name']
@@ -115,13 +105,13 @@
[boost::tti::'trait']
]
[
- [[macroref BOOST_TTI_HAS_STATIC_MEMBER]]
- [[macroref BOOST_TTI_MTFC_HAS_STATIC_MEMBER]]
- [boost::tti::mtfc\_has\_static\_member\_'name']
+ [[macroref BOOST_TTI_HAS_COMP_MEMBER_FUNCTION]]
+ [[macroref BOOST_TTI_MTFC_HAS_COMP_MEMBER_FUNCTION]]
+ [boost::tti::mtfc\_has\_comp\_member\_function\_'name']
]
[
- [[macroref BOOST_TTI_TRAIT_HAS_STATIC_MEMBER]]
- [[macroref BOOST_TTI_MTFC_TRAIT_HAS_STATIC_MEMBER]]
+ [[macroref BOOST_TTI_TRAIT_HAS_COMP_MEMBER_FUNCTION]]
+ [[macroref BOOST_TTI_MTFC_TRAIT_HAS_COMP_MEMBER_FUNCTION]]
[boost::tti::'trait']
]
[
@@ -145,6 +135,16 @@
[boost::tti::'trait']
]
[
+ [[macroref BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION]]
+ [[macroref BOOST_TTI_MTFC_HAS_COMP_STATIC_MEMBER_FUNCTION]]
+ [boost::tti::mtfc\_has\_comp\_static\_member\_function\_'name']
+ ]
+ [
+ [[macroref BOOST_TTI_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION]]
+ [[macroref BOOST_TTI_MTFC_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION]]
+ [boost::tti::'trait']
+ ]
+ [
[[macroref BOOST_TTI_MEMBER_TYPE]]
[[macroref BOOST_TTI_MTFC_MEMBER_TYPE]]
[boost::tti::mtfc\_member\_type\_'name']
Modified: sandbox/tti/libs/tti/doc/tti_using_mm.qbk
==============================================================================
--- sandbox/tti/libs/tti/doc/tti_using_mm.qbk (original)
+++ sandbox/tti/libs/tti/doc/tti_using_mm.qbk 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -151,30 +151,30 @@
AType::BType
>
-[heading Member function with composite type]
+[heading Member function with individual types]
Does T have a member function called 'IntFunction' whose type is
'int (short)' ?
- BOOST_TTI_HAS_MEMBER(IntFunction)
+ BOOST_TTI_HAS_MEMBER_FUNCTION(IntFunction)
- boost::tti::has_member_IntFunction
+ boost::tti::has_member_function_IntFunction
<
- int (T::*)(short)
+ T,
+ int,
+ boost::mpl::vector<short>
>
-[heading Member function with individual types]
+[heading Member function with composite type]
Does T have a member function called 'IntFunction' whose type is
'int (short)' ?
- BOOST_TTI_HAS_MEMBER_FUNCTION(IntFunction)
+ BOOST_TTI_HAS_COMP_MEMBER_FUNCTION(IntFunction)
- boost::tti::has_member_function_IntFunction
+ boost::tti::has_comp_member_function_IntFunction
<
- T,
- int,
- boost::mpl::vector<short>
+ int (T::*)(short)
>
[heading Static member data]
@@ -189,31 +189,31 @@
short
>
-[heading Static member function with composite type]
+[heading Static member function with individual types]
Does T have a static member function called 'SIntFunction' whose type
is 'int (long,double)' ?
- BOOST_TTI_HAS_STATIC_MEMBER(SIntFunction)
+ BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION(SIntFunction)
- boost::tti::has_static_member_SIntFunction
+ boost::tti::has_static_member_function_SIntFunction
<
T,
- int (long,double)
+ int,
+ boost::mpl::vector<long,double>
>
-[heading Static member function with individual types]
+[heading Static member function with composite type]
Does T have a static member function called 'SIntFunction' whose type
is 'int (long,double)' ?
- BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION(SIntFunction)
+ BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION(SIntFunction)
- boost::tti::has_static_member_function_SIntFunction
+ boost::tti::has_comp_static_member_function_SIntFunction
<
T,
- int,
- boost::mpl::vector<long,double>
+ int (long,double)
>
[heading Member type]
Modified: sandbox/tti/libs/tti/test/test_has_member.cpp
==============================================================================
--- sandbox/tti/libs/tti/test/test_has_member.cpp (original)
+++ sandbox/tti/libs/tti/test/test_has_member.cpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -4,13 +4,13 @@
int main()
{
- BOOST_TEST(boost::tti::has_member_VoidFunction<void (AType::*)()>::value);
+ BOOST_TEST(boost::tti::has_comp_member_function_VoidFunction<void (AType::*)()>::value);
BOOST_TEST(boost::tti::FunctionReturningInt<int (AType::*)()>::value);
BOOST_TEST(boost::tti::FunctionReturningInt<double (AnotherType::*)(int)>::value);
- BOOST_TEST(boost::tti::has_member_aFunction<AType (AnotherType::*)(int)>::value);
+ BOOST_TEST(boost::tti::has_comp_member_function_aFunction<AType (AnotherType::*)(int)>::value);
BOOST_TEST(boost::tti::AnotherIntFunction<int (AnotherType::*)(AType)>::value);
- BOOST_TEST(boost::tti::has_member_sFunction<AType::AnIntType (AnotherType::*)(int,long,double)>::value);
- BOOST_TEST(!boost::tti::has_member_someFunctionMember<AType (AnotherType::*)(long,int)>::value);
+ BOOST_TEST(boost::tti::has_comp_member_function_sFunction<AType::AnIntType (AnotherType::*)(int,long,double)>::value);
+ BOOST_TEST(!boost::tti::has_comp_member_function_someFunctionMember<AType (AnotherType::*)(long,int)>::value);
return boost::report_errors();
Modified: sandbox/tti/libs/tti/test/test_has_member.hpp
==============================================================================
--- sandbox/tti/libs/tti/test/test_has_member.hpp (original)
+++ sandbox/tti/libs/tti/test/test_has_member.hpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -4,11 +4,11 @@
#include "test_structs.hpp"
#include <boost/tti/comp_mem_fun.hpp>
-BOOST_TTI_HAS_MEMBER(VoidFunction)
-BOOST_TTI_TRAIT_HAS_MEMBER(FunctionReturningInt,IntFunction)
-BOOST_TTI_HAS_MEMBER(aFunction)
-BOOST_TTI_TRAIT_HAS_MEMBER(AnotherIntFunction,anotherFunction)
-BOOST_TTI_HAS_MEMBER(sFunction)
-BOOST_TTI_HAS_MEMBER(someFunctionMember)
+BOOST_TTI_HAS_COMP_MEMBER_FUNCTION(VoidFunction)
+BOOST_TTI_TRAIT_HAS_COMP_MEMBER_FUNCTION(FunctionReturningInt,IntFunction)
+BOOST_TTI_HAS_COMP_MEMBER_FUNCTION(aFunction)
+BOOST_TTI_TRAIT_HAS_COMP_MEMBER_FUNCTION(AnotherIntFunction,anotherFunction)
+BOOST_TTI_HAS_COMP_MEMBER_FUNCTION(sFunction)
+BOOST_TTI_HAS_COMP_MEMBER_FUNCTION(someFunctionMember)
#endif // TEST_HAS_MEMBER_HPP
Modified: sandbox/tti/libs/tti/test/test_has_member_compile.cpp
==============================================================================
--- sandbox/tti/libs/tti/test/test_has_member_compile.cpp (original)
+++ sandbox/tti/libs/tti/test/test_has_member_compile.cpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -6,16 +6,16 @@
// You can always instantiate without compiler errors
- boost::tti::has_member_someFunctionMember<double (AnotherType::*)(short,short,long,int)> aVar3;
+ boost::tti::has_comp_member_function_someFunctionMember<double (AnotherType::*)(short,short,long,int)> aVar3;
// Compile time asserts
- BOOST_MPL_ASSERT((boost::tti::has_member_VoidFunction<void (AType::*)()>));
+ BOOST_MPL_ASSERT((boost::tti::has_comp_member_function_VoidFunction<void (AType::*)()>));
BOOST_MPL_ASSERT((boost::tti::FunctionReturningInt<int (AType::*)()>));
BOOST_MPL_ASSERT((boost::tti::FunctionReturningInt<double (AnotherType::*)(int)>));
- BOOST_MPL_ASSERT((boost::tti::has_member_aFunction<AType (AnotherType::*)(int)>));
+ BOOST_MPL_ASSERT((boost::tti::has_comp_member_function_aFunction<AType (AnotherType::*)(int)>));
BOOST_MPL_ASSERT((boost::tti::AnotherIntFunction<int (AnotherType::*)(AType)>));
- BOOST_MPL_ASSERT((boost::tti::has_member_sFunction<AType::AnIntType (AnotherType::*)(int,long,double)>));
+ BOOST_MPL_ASSERT((boost::tti::has_comp_member_function_sFunction<AType::AnIntType (AnotherType::*)(int,long,double)>));
return 0;
Modified: sandbox/tti/libs/tti/test/test_has_member_fail.cpp
==============================================================================
--- sandbox/tti/libs/tti/test/test_has_member_fail.cpp (original)
+++ sandbox/tti/libs/tti/test/test_has_member_fail.cpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -6,7 +6,7 @@
// Wrong function signature for sFunction
- BOOST_MPL_ASSERT(( boost::tti::has_member_sFunction<AType::AnIntType (AnotherType::*)(short,long,double)> ));
+ BOOST_MPL_ASSERT(( boost::tti::has_comp_member_function_sFunction<AType::AnIntType (AnotherType::*)(short,long,double)> ));
return 0;
Modified: sandbox/tti/libs/tti/test/test_has_member_fail2.cpp
==============================================================================
--- sandbox/tti/libs/tti/test/test_has_member_fail2.cpp (original)
+++ sandbox/tti/libs/tti/test/test_has_member_fail2.cpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -5,7 +5,7 @@
// Function signature has type which does not exist
- boost::tti::has_member_sFunction<AType::AnIntType (NVType::*)(short,long,double)> aVar;
+ boost::tti::has_comp_member_function_sFunction<AType::AnIntType (NVType::*)(short,long,double)> aVar;
return 0;
Modified: sandbox/tti/libs/tti/test/test_has_static_member.cpp
==============================================================================
--- sandbox/tti/libs/tti/test/test_has_static_member.cpp (original)
+++ sandbox/tti/libs/tti/test/test_has_static_member.cpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -7,7 +7,7 @@
BOOST_TEST((boost::tti::HaveTheSIntFunction<AType,int (long,double)>::value));
BOOST_TEST((!boost::tti::TheTIntFunction<AType,AType (long,double)>::value));
BOOST_TEST((boost::tti::TheTIntFunction<AnotherType,AType (long,double)>::value));
- BOOST_TEST((boost::tti::has_static_member_TSFunction<AnotherType,AType::AStructType (AType::AnIntType,double)>::value));
+ BOOST_TEST((boost::tti::has_comp_static_member_function_TSFunction<AnotherType,AType::AStructType (AType::AnIntType,double)>::value));
BOOST_TEST((!boost::tti::Pickedname<AnotherType,void ()>::value));
return boost::report_errors();
Modified: sandbox/tti/libs/tti/test/test_has_static_member.hpp
==============================================================================
--- sandbox/tti/libs/tti/test/test_has_static_member.hpp (original)
+++ sandbox/tti/libs/tti/test/test_has_static_member.hpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -4,9 +4,9 @@
#include "test_structs.hpp"
#include <boost/tti/comp_static_mem_fun.hpp>
-BOOST_TTI_TRAIT_HAS_STATIC_MEMBER(HaveTheSIntFunction,SIntFunction)
-BOOST_TTI_TRAIT_HAS_STATIC_MEMBER(TheTIntFunction,TIntFunction)
-BOOST_TTI_HAS_STATIC_MEMBER(TSFunction)
-BOOST_TTI_TRAIT_HAS_STATIC_MEMBER(Pickedname,SomeStaticFunction)
+BOOST_TTI_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(HaveTheSIntFunction,SIntFunction)
+BOOST_TTI_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(TheTIntFunction,TIntFunction)
+BOOST_TTI_HAS_COMP_STATIC_MEMBER_FUNCTION(TSFunction)
+BOOST_TTI_TRAIT_HAS_COMP_STATIC_MEMBER_FUNCTION(Pickedname,SomeStaticFunction)
#endif // TEST_HAS_STATIC_MEMBER_HPP
Modified: sandbox/tti/libs/tti/test/test_has_static_member_compile.cpp
==============================================================================
--- sandbox/tti/libs/tti/test/test_has_static_member_compile.cpp (original)
+++ sandbox/tti/libs/tti/test/test_has_static_member_compile.cpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -13,7 +13,7 @@
BOOST_MPL_ASSERT((boost::tti::HaveTheSIntFunction<AType,int (long,double)>));
BOOST_MPL_ASSERT((boost::tti::TheTIntFunction<AnotherType,AType (long,double)>));
- BOOST_MPL_ASSERT((boost::tti::has_static_member_TSFunction<AnotherType,AType::AStructType (AType::AnIntType,double)>));
+ BOOST_MPL_ASSERT((boost::tti::has_comp_static_member_function_TSFunction<AnotherType,AType::AStructType (AType::AnIntType,double)>));
return 0;
Modified: sandbox/tti/libs/tti/test/test_has_static_member_fail2.cpp
==============================================================================
--- sandbox/tti/libs/tti/test/test_has_static_member_fail2.cpp (original)
+++ sandbox/tti/libs/tti/test/test_has_static_member_fail2.cpp 2011-03-08 14:27:00 EST (Tue, 08 Mar 2011)
@@ -5,7 +5,7 @@
// Function signature has type which does not exist
- boost::tti::has_static_member_TSFunction<AnotherType,AType::AClassType (AType::AnIntType,double)> aVar;
+ boost::tti::has_comp_static_member_function_TSFunction<AnotherType,AType::AClassType (AType::AnIntType,double)> aVar;
return 0;