|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r73986 - trunk/libs/tti/test
From: eldiener_at_[hidden]
Date: 2011-08-21 15:05:19
Author: eldiener
Date: 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
New Revision: 73986
URL: http://svn.boost.org/trac/boost/changeset/73986
Log:
Updating tests.
Text files modified:
trunk/libs/tti/test/Jamfile.v2 | 86 ++++++++++++++++++++++++++++++++++++++++
trunk/libs/tti/test/test_mf_has_mem_data_compile.cpp | 25 ++++++-----
trunk/libs/tti/test/test_mf_has_mem_fun.cpp | 19 ++++----
trunk/libs/tti/test/test_mf_has_mem_fun.hpp | 7 ---
trunk/libs/tti/test/test_mf_has_mem_fun_compile.cpp | 21 +++++----
trunk/libs/tti/test/test_mf_has_mem_fun_fail2.cpp | 2
trunk/libs/tti/test/test_mf_has_static_data.cpp | 3
trunk/libs/tti/test/test_mf_has_static_data.hpp | 3 -
trunk/libs/tti/test/test_mf_has_static_data_compile.cpp | 3
trunk/libs/tti/test/test_mf_has_static_fun.cpp | 15 +++---
trunk/libs/tti/test/test_mf_has_static_fun.hpp | 5 --
trunk/libs/tti/test/test_mf_has_static_fun_compile.cpp | 18 ++++----
trunk/libs/tti/test/test_mf_has_static_fun_fail.cpp | 2
trunk/libs/tti/test/test_mf_has_static_fun_fail2.cpp | 2
trunk/libs/tti/test/test_mf_has_static_fun_fail3.cpp | 2
trunk/libs/tti/test/test_mf_has_template.cpp | 19 ++++----
trunk/libs/tti/test/test_mf_has_template.hpp | 8 ---
trunk/libs/tti/test/test_mf_has_template_compile.cpp | 17 ++++---
trunk/libs/tti/test/test_mf_has_template_cp.cpp | 23 +++++-----
trunk/libs/tti/test/test_mf_has_template_cp.hpp | 8 ---
trunk/libs/tti/test/test_mf_has_template_cp_compile.cpp | 19 ++++----
trunk/libs/tti/test/test_mf_has_template_cp_fail.cpp | 2
trunk/libs/tti/test/test_mf_has_template_cp_fail3.cpp | 2
trunk/libs/tti/test/test_mf_has_template_fail.cpp | 2
trunk/libs/tti/test/test_mf_has_template_fail2.cpp | 2
trunk/libs/tti/test/test_mf_has_template_fail4.cpp | 2
trunk/libs/tti/test/test_mf_has_type.cpp | 25 ++++++-----
trunk/libs/tti/test/test_mf_has_type.hpp | 13 ------
trunk/libs/tti/test/test_mf_has_type_compile.cpp | 25 ++++++-----
trunk/libs/tti/test/test_mf_has_type_ct.cpp | 29 ++++++------
trunk/libs/tti/test/test_mf_has_type_ct.hpp | 12 -----
trunk/libs/tti/test/test_mf_has_type_ct_compile.cpp | 29 ++++++------
trunk/libs/tti/test/test_mf_has_type_ct_fail3.cpp | 2
trunk/libs/tti/test/test_mf_mem_type.cpp | 23 +++++-----
trunk/libs/tti/test/test_mf_mem_type.hpp | 9 ----
trunk/libs/tti/test/test_mf_mem_type_compile.cpp | 25 ++++++-----
trunk/libs/tti/test/test_vm_mf_has_template_cp.cpp | 25 ++++++-----
trunk/libs/tti/test/test_vm_mf_has_template_cp.hpp | 8 ---
trunk/libs/tti/test/test_vm_mf_has_template_cp_compile.cpp | 19 ++++----
trunk/libs/tti/test/test_vm_mf_has_template_cp_fail.cpp | 2
trunk/libs/tti/test/test_vm_mf_has_template_cp_fail3.cpp | 2
41 files changed, 298 insertions(+), 267 deletions(-)
Modified: trunk/libs/tti/test/Jamfile.v2
==============================================================================
--- trunk/libs/tti/test/Jamfile.v2 (original)
+++ trunk/libs/tti/test/Jamfile.v2 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -76,6 +76,47 @@
[ run test_mem_type.cpp ]
[ compile test_mem_type_compile.cpp ]
[ run test_mf_has_mem_data.cpp ]
+ [ compile test_mf_has_mem_data_compile.cpp ]
+ [ compile-fail test_mf_has_mem_data_fail.cpp ]
+ [ compile-fail test_mf_has_mem_data_fail2.cpp ]
+ [ compile-fail test_mf_has_mem_data_fail3.cpp ]
+ [ run test_mf_has_mem_fun.cpp ]
+ [ compile test_mf_has_mem_fun_compile.cpp ]
+ [ compile-fail test_mf_has_mem_fun_fail.cpp ]
+ [ compile-fail test_mf_has_mem_fun_fail2.cpp ]
+ [ compile-fail test_mf_has_mem_fun_fail3.cpp ]
+ [ run test_mf_has_static_data.cpp ]
+ [ compile test_mf_has_static_data_compile.cpp ]
+ [ compile-fail test_mf_has_static_data_fail.cpp ]
+ [ compile-fail test_mf_has_static_data_fail2.cpp ]
+ [ compile-fail test_mf_has_static_data_fail3.cpp ]
+ [ run test_mf_has_static_fun.cpp ]
+ [ compile test_mf_has_static_fun_compile.cpp ]
+ [ compile-fail test_mf_has_static_fun_fail.cpp ]
+ [ compile-fail test_mf_has_static_fun_fail2.cpp ]
+ [ compile-fail test_mf_has_static_fun_fail3.cpp ]
+ [ run test_mf_has_template.cpp ]
+ [ compile test_mf_has_template_compile.cpp ]
+ [ compile-fail test_mf_has_template_fail.cpp ]
+ [ compile-fail test_mf_has_template_fail2.cpp ]
+ [ compile-fail test_mf_has_template_fail3.cpp ]
+ [ compile-fail test_mf_has_template_fail4.cpp ]
+ [ run test_mf_has_template_cp.cpp ]
+ [ compile test_mf_has_template_cp_compile.cpp ]
+ [ compile-fail test_mf_has_template_cp_fail.cpp ]
+ [ compile-fail test_mf_has_template_cp_fail2.cpp ]
+ [ compile-fail test_mf_has_template_cp_fail3.cpp ]
+ [ run test_mf_has_type.cpp ]
+ [ compile test_mf_has_type_compile.cpp ]
+ [ compile-fail test_mf_has_type_fail.cpp ]
+ [ compile-fail test_mf_has_type_fail2.cpp ]
+ [ run test_mf_has_type_ct.cpp ]
+ [ compile test_mf_has_type_ct_compile.cpp ]
+ [ compile-fail test_mf_has_type_ct_fail.cpp ]
+ [ compile-fail test_mf_has_type_ct_fail2.cpp ]
+ [ compile-fail test_mf_has_type_ct_fail3.cpp ]
+ [ run test_mf_mem_type.cpp ]
+ [ compile test_mf_mem_type_compile.cpp ]
;
alias ttivm
@@ -134,4 +175,49 @@
<toolset>gcc-4.5.2:<cxxflags>-std=c++0x
<toolset>gcc-4.6.0:<cxxflags>-std=c++0x
<define>BOOST_PP_VARIADICS=1 ]
+ [ run test_vm_mf_has_template_cp.cpp : : :
+ <toolset>gcc-4.3.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.3.0:<cxxflags>-U__STRICT_ANSI__
+ <toolset>gcc-4.4.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.4.0:<cxxflags>-U__STRICT_ANSI__
+ <toolset>gcc-4.5.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.5.2:<cxxflags>-std=c++0x
+ <toolset>gcc-4.6.0:<cxxflags>-std=c++0x
+ <define>BOOST_PP_VARIADICS=1 ]
+ [ compile test_vm_mf_has_template_cp_compile.cpp :
+ <toolset>gcc-4.3.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.3.0:<cxxflags>-U__STRICT_ANSI__
+ <toolset>gcc-4.4.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.4.0:<cxxflags>-U__STRICT_ANSI__
+ <toolset>gcc-4.5.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.5.2:<cxxflags>-std=c++0x
+ <toolset>gcc-4.6.0:<cxxflags>-std=c++0x
+ <define>BOOST_PP_VARIADICS=1 ]
+ [ compile-fail test_vm_mf_has_template_cp_fail.cpp :
+ <toolset>gcc-4.3.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.3.0:<cxxflags>-U__STRICT_ANSI__
+ <toolset>gcc-4.4.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.4.0:<cxxflags>-U__STRICT_ANSI__
+ <toolset>gcc-4.5.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.5.2:<cxxflags>-std=c++0x
+ <toolset>gcc-4.6.0:<cxxflags>-std=c++0x
+ <define>BOOST_PP_VARIADICS=1 ]
+ [ compile-fail test_vm_mf_has_template_cp_fail2.cpp :
+ <toolset>gcc-4.3.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.3.0:<cxxflags>-U__STRICT_ANSI__
+ <toolset>gcc-4.4.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.4.0:<cxxflags>-U__STRICT_ANSI__
+ <toolset>gcc-4.5.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.5.2:<cxxflags>-std=c++0x
+ <toolset>gcc-4.6.0:<cxxflags>-std=c++0x
+ <define>BOOST_PP_VARIADICS=1 ]
+ [ compile-fail test_vm_mf_has_template_cp_fail3.cpp :
+ <toolset>gcc-4.3.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.3.0:<cxxflags>-U__STRICT_ANSI__
+ <toolset>gcc-4.4.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.4.0:<cxxflags>-U__STRICT_ANSI__
+ <toolset>gcc-4.5.0:<cxxflags>-std=c++0x
+ <toolset>gcc-4.5.2:<cxxflags>-std=c++0x
+ <toolset>gcc-4.6.0:<cxxflags>-std=c++0x
+ <define>BOOST_PP_VARIADICS=1 ]
;
Modified: trunk/libs/tti/test/test_mf_has_mem_data_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_mem_data_compile.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_mem_data_compile.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_mem_data.hpp"
#include <boost/mpl/assert.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -38,7 +39,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_TRAIT_GEN(CMember)<_,_>,
+ CMember<_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<bool>
>
@@ -54,7 +55,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_TRAIT_GEN(NestedData)<_,_>,
+ NestedData<_,_>,
boost::mpl::identity<AType>,
boost::tti::mf_member_type
<
@@ -66,7 +67,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_TRAIT_GEN(AOther)<_,_>,
+ AOther<_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<AType>
>
@@ -82,7 +83,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_MTFC_HAS_MEMBER_DATA_GEN(AnInt),
+ boost::mpl::quote2<BOOST_TTI_HAS_MEMBER_DATA_GEN(AnInt)>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>
>
@@ -90,7 +91,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_MTFC_HAS_MEMBER_DATA_GEN(AnInt),
+ boost::mpl::quote2<BOOST_TTI_HAS_MEMBER_DATA_GEN(AnInt)>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<long>
>
@@ -98,7 +99,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_MTFC_HAS_MEMBER_DATA_GEN(aMember),
+ boost::mpl::quote2<BOOST_TTI_HAS_MEMBER_DATA_GEN(aMember)>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<bool>
>
@@ -106,7 +107,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_TRAIT_GEN(MFCMember),
+ boost::mpl::quote2<CMember>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<bool>
>
@@ -114,7 +115,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_MTFC_HAS_MEMBER_DATA_GEN(IntBT),
+ boost::mpl::quote2<BOOST_TTI_HAS_MEMBER_DATA_GEN(IntBT)>,
boost::mpl::identity<AType>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
@@ -122,11 +123,11 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_TRAIT_GEN(MFNestedData),
+ boost::mpl::quote2<NestedData>,
boost::mpl::identity<AType>,
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
>
@@ -134,7 +135,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_TRAIT_GEN(MFAOther),
+ boost::mpl::quote2<AOther>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<AType>
>
@@ -142,7 +143,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_data
<
- BOOST_TTI_MTFC_HAS_MEMBER_DATA_GEN(ONestStr),
+ boost::mpl::quote2<BOOST_TTI_HAS_MEMBER_DATA_GEN(ONestStr)>,
boost::mpl::identity<AnotherType>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
Modified: trunk/libs/tti/test/test_mf_has_mem_fun.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_mem_fun.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_mem_fun.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_mem_fun.hpp"
#include <boost/detail/lightweight_test.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -23,7 +24,7 @@
BOOST_TEST((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(FunctionReturningInt)<_,_>,
+ FunctionReturningInt<_,_>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>
>
@@ -32,7 +33,7 @@
BOOST_TEST((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(FunctionReturningInt)<_,_,_>,
+ FunctionReturningInt<_,_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<double>,
boost::mpl::vector<boost::mpl::identity<int> >
@@ -52,7 +53,7 @@
BOOST_TEST((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(AnotherIntFunction)<_,_,_>,
+ AnotherIntFunction<_,_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<int>,
boost::mpl::vector<boost::mpl::identity<AType> >
@@ -77,7 +78,7 @@
BOOST_TEST((boost::tti::mf_has_member_function
<
- BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_GEN(VoidFunction),
+ boost::mpl::quote4<BOOST_TTI_HAS_MEMBER_FUNCTION_GEN(VoidFunction)>,
boost::mpl::identity<AType>,
boost::mpl::identity<void>
>
@@ -86,7 +87,7 @@
BOOST_TEST((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(MFFunctionReturningInt),
+ boost::mpl::quote4<FunctionReturningInt>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>
>
@@ -95,7 +96,7 @@
BOOST_TEST((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(MFFunctionReturningInt),
+ boost::mpl::quote4<FunctionReturningInt>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<double>,
boost::mpl::vector<boost::mpl::identity<int> >
@@ -105,7 +106,7 @@
BOOST_TEST((boost::tti::mf_has_member_function
<
- BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_GEN(aFunction),
+ boost::mpl::quote4<BOOST_TTI_HAS_MEMBER_FUNCTION_GEN(aFunction)>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<AType>,
boost::mpl::vector<boost::mpl::identity<int> >
@@ -115,7 +116,7 @@
BOOST_TEST((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(MFAnotherIntFunction),
+ boost::mpl::quote4<AnotherIntFunction>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<int>,
boost::mpl::vector<boost::mpl::identity<AType> >
@@ -125,7 +126,7 @@
BOOST_TEST((boost::tti::mf_has_member_function
<
- BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_GEN(sFunction),
+ boost::mpl::quote4<BOOST_TTI_HAS_MEMBER_FUNCTION_GEN(sFunction)>,
boost::mpl::identity<AnotherType>,
BOOST_TTI_MEMBER_TYPE_GEN(AnIntType)<AType>,
boost::mpl::vector
Modified: trunk/libs/tti/test/test_mf_has_mem_fun.hpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_mem_fun.hpp (original)
+++ trunk/libs/tti/test/test_mf_has_mem_fun.hpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -18,13 +18,6 @@
BOOST_TTI_HAS_MEMBER_FUNCTION(sFunction)
BOOST_TTI_HAS_MEMBER_FUNCTION(someFunctionMember)
-BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION(VoidFunction)
-BOOST_TTI_MTFC_TRAIT_HAS_MEMBER_FUNCTION(MFFunctionReturningInt,IntFunction)
-BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION(aFunction)
-BOOST_TTI_MTFC_TRAIT_HAS_MEMBER_FUNCTION(MFAnotherIntFunction,anotherFunction)
-BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION(sFunction)
-BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION(someFunctionMember)
-
BOOST_TTI_MEMBER_TYPE(AnIntType)
#endif // TEST_MF_HAS_MEMBER_FUNCTION_HPP
Modified: trunk/libs/tti/test/test_mf_has_mem_fun_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_mem_fun_compile.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_mem_fun_compile.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_mem_fun.hpp"
#include <boost/mpl/assert.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -16,7 +17,7 @@
boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(FunctionReturningInt)<_,_>,
+ FunctionReturningInt<_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<short>
> aVar;
@@ -59,7 +60,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(FunctionReturningInt)<_,_>,
+ FunctionReturningInt<_,_>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>
>
@@ -67,7 +68,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(FunctionReturningInt)<_,_,_>,
+ FunctionReturningInt<_,_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<double>,
boost::mpl::vector<boost::mpl::identity<int> >
@@ -85,7 +86,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(AnotherIntFunction)<_,_,_>,
+ AnotherIntFunction<_,_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<int>,
boost::mpl::vector<boost::mpl::identity<AType> >
@@ -108,7 +109,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_function
<
- BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_GEN(VoidFunction),
+ boost::mpl::quote4<BOOST_TTI_HAS_MEMBER_FUNCTION_GEN(VoidFunction)>,
boost::mpl::identity<AType>,
boost::mpl::identity<void>
>
@@ -116,7 +117,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(MFFunctionReturningInt),
+ boost::mpl::quote4<FunctionReturningInt>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>
>
@@ -124,7 +125,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(MFFunctionReturningInt),
+ boost::mpl::quote4<FunctionReturningInt>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<double>,
boost::mpl::vector<boost::mpl::identity<int> >
@@ -133,7 +134,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_function
<
- BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_GEN(aFunction),
+ boost::mpl::quote4<BOOST_TTI_HAS_MEMBER_FUNCTION_GEN(aFunction)>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<AType>,
boost::mpl::vector<boost::mpl::identity<int> >
@@ -142,7 +143,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(MFAnotherIntFunction),
+ boost::mpl::quote4<AnotherIntFunction>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<int>,
boost::mpl::vector<boost::mpl::identity<AType> >
@@ -151,7 +152,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_function
<
- BOOST_TTI_MTFC_HAS_MEMBER_FUNCTION_GEN(sFunction),
+ boost::mpl::quote4<BOOST_TTI_HAS_MEMBER_FUNCTION_GEN(sFunction)>,
boost::mpl::identity<AnotherType>,
BOOST_TTI_MEMBER_TYPE_GEN(AnIntType)<AType>,
boost::mpl::vector
Modified: trunk/libs/tti/test/test_mf_has_mem_fun_fail2.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_mem_fun_fail2.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_mem_fun_fail2.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -16,7 +16,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_member_function
<
- BOOST_TTI_TRAIT_GEN(FunctionReturningInt)<_,_>,
+ FunctionReturningInt<_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<short>
>
Modified: trunk/libs/tti/test/test_mf_has_static_data.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_static_data.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_static_data.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_static_data.hpp"
#include <boost/detail/lightweight_test.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -23,7 +24,7 @@
BOOST_TEST((boost::tti::mf_has_static_member_data
<
- BOOST_TTI_MTFC_HAS_STATIC_MEMBER_DATA_GEN(DSMember),
+ boost::mpl::quote2<BOOST_TTI_HAS_STATIC_MEMBER_DATA_GEN(DSMember)>,
boost::mpl::identity<AType>,
boost::mpl::identity<short>
>
Modified: trunk/libs/tti/test/test_mf_has_static_data.hpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_static_data.hpp (original)
+++ trunk/libs/tti/test/test_mf_has_static_data.hpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -13,7 +13,4 @@
BOOST_TTI_HAS_STATIC_MEMBER_DATA(DSMember)
BOOST_TTI_HAS_STATIC_MEMBER_DATA(SomeStaticData)
-BOOST_TTI_MTFC_HAS_STATIC_MEMBER_DATA(DSMember)
-BOOST_TTI_MTFC_HAS_STATIC_MEMBER_DATA(SomeStaticData)
-
#endif // TEST_MF_HAS_STATIC_DATA_HPP
Modified: trunk/libs/tti/test/test_mf_has_static_data_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_static_data_compile.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_static_data_compile.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_static_data.hpp"
#include <boost/mpl/assert.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -33,7 +34,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_static_member_data
<
- BOOST_TTI_MTFC_HAS_STATIC_MEMBER_DATA_GEN(DSMember),
+ boost::mpl::quote2<BOOST_TTI_HAS_STATIC_MEMBER_DATA_GEN(DSMember)>,
boost::mpl::identity<AType>,
boost::mpl::identity<short>
>
Modified: trunk/libs/tti/test/test_mf_has_static_fun.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_static_fun.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_static_fun.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_static_fun.hpp"
#include <boost/detail/lightweight_test.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -14,7 +15,7 @@
BOOST_TEST((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(HaveTheSIntFunction)<_,_,_>,
+ HaveTheSIntFunction<_,_,_>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>,
boost::mpl::vector
@@ -28,7 +29,7 @@
BOOST_TEST((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(TheTIntFunction)<_,_,_>,
+ TheTIntFunction<_,_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<AType>,
boost::mpl::vector
@@ -47,7 +48,7 @@
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>,
boost::mpl::vector
<
- BOOST_TTI_TRAIT_GEN(NameIntType)<AType>,
+ NameIntType<AType>,
boost::mpl::identity<double>
>
>
@@ -56,7 +57,7 @@
BOOST_TEST((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(MFHaveTheSIntFunction),
+ boost::mpl::quote4<HaveTheSIntFunction>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>,
boost::mpl::vector
@@ -70,7 +71,7 @@
BOOST_TEST((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(MFCTheTIntFunction),
+ boost::mpl::quote4<TheTIntFunction>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<AType>,
boost::mpl::vector
@@ -84,12 +85,12 @@
BOOST_TEST((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_MTFC_HAS_STATIC_MEMBER_FUNCTION_GEN(TSFunction),
+ boost::mpl::quote4<BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION_GEN(TSFunction)>,
boost::mpl::identity<AnotherType>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>,
boost::mpl::vector
<
- BOOST_TTI_TRAIT_GEN(NameIntType)<AType>,
+ NameIntType<AType>,
boost::mpl::identity<double>
>
>
Modified: trunk/libs/tti/test/test_mf_has_static_fun.hpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_static_fun.hpp (original)
+++ trunk/libs/tti/test/test_mf_has_static_fun.hpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -16,11 +16,6 @@
BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION(TSFunction)
BOOST_TTI_TRAIT_HAS_STATIC_MEMBER_FUNCTION(Pickedname,SomeStaticFunction)
-BOOST_TTI_MTFC_TRAIT_HAS_STATIC_MEMBER_FUNCTION(MFHaveTheSIntFunction,SIntFunction)
-BOOST_TTI_MTFC_TRAIT_HAS_STATIC_MEMBER_FUNCTION(MFCTheTIntFunction,TIntFunction)
-BOOST_TTI_MTFC_HAS_STATIC_MEMBER_FUNCTION(TSFunction)
-BOOST_TTI_MTFC_TRAIT_HAS_STATIC_MEMBER_FUNCTION(MTFCPickedname,SomeStaticFunction)
-
BOOST_TTI_MEMBER_TYPE(AStructType)
BOOST_TTI_TRAIT_MEMBER_TYPE(NameIntType,AnIntType)
Modified: trunk/libs/tti/test/test_mf_has_static_fun_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_static_fun_compile.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_static_fun_compile.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -16,7 +16,7 @@
boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(HaveTheSIntFunction)<_,_,_>,
+ HaveTheSIntFunction<_,_,_>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>,
boost::mpl::vector
@@ -28,7 +28,7 @@
boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(MTFCPickedname),
+ boost::mpl::quote4<Pickedname>,
boost::mpl::identity<AType>,
boost::mpl::identity<double>,
boost::mpl::vector<boost::mpl::identity<float> >
@@ -38,7 +38,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(HaveTheSIntFunction)<_,_,_>,
+ HaveTheSIntFunction<_,_,_>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>,
boost::mpl::vector
@@ -51,7 +51,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(TheTIntFunction)<_,_,_>,
+ TheTIntFunction<_,_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<AType>,
boost::mpl::vector
@@ -69,7 +69,7 @@
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>,
boost::mpl::vector
<
- BOOST_TTI_TRAIT_GEN(NameIntType)<AType>,
+ NameIntType<AType>,
boost::mpl::identity<double>
>
>
@@ -77,7 +77,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(MFHaveTheSIntFunction),
+ boost::mpl::quote4<HaveTheSIntFunction>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>,
boost::mpl::vector
@@ -90,7 +90,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(MFCTheTIntFunction),
+ boost::mpl::quote4<TheTIntFunction>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<AType>,
boost::mpl::vector
@@ -103,12 +103,12 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_MTFC_HAS_STATIC_MEMBER_FUNCTION_GEN(TSFunction),
+ boost::mpl::quote4<BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION_GEN(TSFunction)>,
boost::mpl::identity<AnotherType>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>,
boost::mpl::vector
<
- BOOST_TTI_TRAIT_GEN(NameIntType)<AType>,
+ NameIntType<AType>,
boost::mpl::identity<double>
>
>
Modified: trunk/libs/tti/test/test_mf_has_static_fun_fail.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_static_fun_fail.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_static_fun_fail.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -16,7 +16,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(Pickedname)<_,_,_>,
+ Pickedname<_,_,_>,
boost::mpl::identity<AType>,
boost::mpl::identity<short>,
boost::mpl::vector
Modified: trunk/libs/tti/test/test_mf_has_static_fun_fail2.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_static_fun_fail2.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_static_fun_fail2.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -16,7 +16,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_static_member_function
<
- BOOST_TTI_TRAIT_GEN(HaveTheSIntFunction)<_,_,_>,
+ HaveTheSIntFunction<_,_,_>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<int>,
boost::mpl::vector
Modified: trunk/libs/tti/test/test_mf_has_static_fun_fail3.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_static_fun_fail3.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_static_fun_fail3.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -21,7 +21,7 @@
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>,
boost::mpl::vector
<
- BOOST_TTI_TRAIT_GEN(NameIntType)<AnotherType>,
+ NameIntType<AnotherType>,
boost::mpl::identity<double>
>
>
Modified: trunk/libs/tti/test/test_mf_has_template.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_template.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_template.hpp"
#include <boost/detail/lightweight_test.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -14,7 +15,7 @@
BOOST_TEST((boost::tti::mf_has_template
<
- BOOST_TTI_TRAIT_GEN(HaveMStr)<_>,
+ HaveMStr<_>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
::value
@@ -23,7 +24,7 @@
BOOST_TEST((!boost::tti::mf_has_template
<
BOOST_TTI_HAS_TEMPLATE_GEN(TemplateNotExist)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
::value
));
@@ -38,7 +39,7 @@
BOOST_TEST((boost::tti::mf_has_template
<
- BOOST_TTI_TRAIT_GEN(HaveCL)<_>,
+ HaveCL<_>,
boost::mpl::identity<AType>
>
::value
@@ -54,7 +55,7 @@
BOOST_TEST((boost::tti::mf_has_template
<
- BOOST_TTI_TRAIT_GEN(MetaHaveMStr),
+ boost::mpl::quote1<HaveMStr>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
::value
@@ -62,15 +63,15 @@
BOOST_TEST((!boost::tti::mf_has_template
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_GEN(TemplateNotExist),
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_GEN(TemplateNotExist)>,
+ MT_BType<AType>
>
::value
));
BOOST_TEST((boost::tti::mf_has_template
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_GEN(ATPMemberTemplate),
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_GEN(ATPMemberTemplate)>,
boost::mpl::identity<AType>
>
::value
@@ -78,7 +79,7 @@
BOOST_TEST((boost::tti::mf_has_template
<
- BOOST_TTI_TRAIT_GEN(MFClassHaveCL),
+ boost::mpl::quote1<HaveCL>,
boost::mpl::identity<AType>
>
::value
@@ -86,7 +87,7 @@
BOOST_TEST((boost::tti::mf_has_template
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_GEN(SimpleTMP),
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_GEN(SimpleTMP)>,
boost::mpl::identity<AnotherType>
>
::value
Modified: trunk/libs/tti/test/test_mf_has_template.hpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template.hpp (original)
+++ trunk/libs/tti/test/test_mf_has_template.hpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -19,14 +19,6 @@
BOOST_TTI_TRAIT_HAS_TEMPLATE(AMT,AnotherMemberTemplate)
BOOST_TTI_HAS_TEMPLATE(SomeMemberTemplate)
-BOOST_TTI_MTFC_TRAIT_HAS_TEMPLATE(MetaHaveMStr,MStrMemberTemplate)
-BOOST_TTI_MTFC_HAS_TEMPLATE(TemplateNotExist)
-BOOST_TTI_MTFC_HAS_TEMPLATE(ATPMemberTemplate)
-BOOST_TTI_MTFC_TRAIT_HAS_TEMPLATE(MFClassHaveCL,CLMemberTemplate)
-BOOST_TTI_MTFC_HAS_TEMPLATE(SimpleTMP)
-BOOST_TTI_MTFC_TRAIT_HAS_TEMPLATE(MFClassAMT,AnotherMemberTemplate)
-BOOST_TTI_MTFC_HAS_TEMPLATE(SomeMemberTemplate)
-
BOOST_TTI_MEMBER_TYPE(AStructType)
BOOST_TTI_TRAIT_MEMBER_TYPE(MT_BType,BType)
Modified: trunk/libs/tti/test/test_mf_has_template_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template_compile.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_template_compile.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_template.hpp"
#include <boost/mpl/assert.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -17,12 +18,12 @@
boost::tti::mf_has_template
<
BOOST_TTI_HAS_TEMPLATE_GEN(TemplateNotExist)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
> aVar;
boost::tti::mf_has_template
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_GEN(ATPMemberTemplate),
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_GEN(ATPMemberTemplate)>,
boost::mpl::identity<AnotherType>
> aVar2;
@@ -30,7 +31,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_template
<
- BOOST_TTI_TRAIT_GEN(HaveMStr)<_>,
+ HaveMStr<_>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
));
@@ -44,7 +45,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_template
<
- BOOST_TTI_TRAIT_GEN(HaveCL)<_>,
+ HaveCL<_>,
boost::mpl::identity<AType>
>
));
@@ -58,28 +59,28 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_template
<
- BOOST_TTI_TRAIT_GEN(MetaHaveMStr),
+ boost::mpl::quote1<HaveMStr>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_template
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_GEN(ATPMemberTemplate),
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_GEN(ATPMemberTemplate)>,
boost::mpl::identity<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_template
<
- BOOST_TTI_TRAIT_GEN(MFClassHaveCL),
+ boost::mpl::quote1<HaveCL>,
boost::mpl::identity<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_template
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_GEN(SimpleTMP),
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_GEN(SimpleTMP)>,
boost::mpl::identity<AnotherType>
>
));
Modified: trunk/libs/tti/test/test_mf_has_template_cp.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template_cp.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_template_cp.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_template_cp.hpp"
#include <boost/detail/lightweight_test.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -14,7 +15,7 @@
BOOST_TEST((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(HT_Str)<_>,
+ HT_Str<_>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
::value
@@ -30,7 +31,7 @@
BOOST_TEST((!boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(WrongParametersForMP)<_>,
+ WrongParametersForMP<_>,
boost::mpl::identity<AnotherType>
>
::value
@@ -42,7 +43,7 @@
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
::value
@@ -54,7 +55,7 @@
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
::value
@@ -62,7 +63,7 @@
BOOST_TEST((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(MF_HT_Str),
+ boost::mpl::quote1<HT_Str>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
::value
@@ -70,7 +71,7 @@
BOOST_TEST((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(AnotherMemberTemplate),
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(AnotherMemberTemplate)>,
boost::mpl::identity<AType>
>
::value
@@ -78,7 +79,7 @@
BOOST_TEST((!boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(MetaCWrongParametersForMP),
+ boost::mpl::quote1<WrongParametersForMP>,
boost::mpl::identity<AnotherType>
>
::value
@@ -86,11 +87,11 @@
BOOST_TEST((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(CTManyParameters),
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(CTManyParameters)>,
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
::value
@@ -98,11 +99,11 @@
BOOST_TEST((!boost::tti::mf_has_template_check_params
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist),
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist)>,
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
::value
Modified: trunk/libs/tti/test/test_mf_has_template_cp.hpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template_cp.hpp (original)
+++ trunk/libs/tti/test/test_mf_has_template_cp.hpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -17,16 +17,8 @@
BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS(CTManyParameters,(class)(class)(int)(short)(class)(template <class)(int> class InnerTemplate)(class))
BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS(TemplateNotExist,(int)(class))
-BOOST_TTI_MTFC_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(MF_HT_Str,MStrMemberTemplate,(class))
-BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS(AnotherMemberTemplate,(int)(int))
-BOOST_TTI_MTFC_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(MetaCWrongParametersForMP,ManyParameters,(class)(class)(int)(class)(template <class> class InnerTemplate)(class)(short))
-BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS(CTManyParameters,(class)(class)(int)(short)(class)(template <class)(int> class InnerTemplate)(class))
-BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS(TemplateNotExist,(int)(class))
-
BOOST_TTI_MEMBER_TYPE(AStructType)
BOOST_TTI_TRAIT_MEMBER_TYPE(MT_BType,BType)
BOOST_TTI_MEMBER_TYPE(CType)
-BOOST_TTI_MTFC_MEMBER_TYPE(CType)
-
#endif // TEST_MF_HAS_TEMPLATE_CHECK_PARAMS_HPP
Modified: trunk/libs/tti/test/test_mf_has_template_cp_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template_cp_compile.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_template_cp_compile.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_template_cp.hpp"
#include <boost/mpl/assert.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -19,8 +20,8 @@
BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist)<_>,
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
+ MT_BType<AType>
>
> aVar;
@@ -28,7 +29,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(HT_Str)<_>,
+ HT_Str<_>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
));
@@ -46,32 +47,32 @@
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(MF_HT_Str),
+ boost::mpl::quote1<HT_Str>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(AnotherMemberTemplate),
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(AnotherMemberTemplate)>,
boost::mpl::identity<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(CTManyParameters),
+ boost::mpl::quote1<BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(CTManyParameters)>,
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
+ MT_BType<AType>
>
>
));
Modified: trunk/libs/tti/test/test_mf_has_template_cp_fail.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template_cp_fail.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_template_cp_fail.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -20,7 +20,7 @@
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
));
Modified: trunk/libs/tti/test/test_mf_has_template_cp_fail3.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template_cp_fail3.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_template_cp_fail3.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -16,7 +16,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(WrongParametersForMP)<_>,
+ WrongParametersForMP<_>,
boost::mpl::identity<AnotherType>
>
));
Modified: trunk/libs/tti/test/test_mf_has_template_fail.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template_fail.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_template_fail.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -17,7 +17,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_template
<
BOOST_TTI_HAS_TEMPLATE_GEN(TemplateNotExist)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
));
Modified: trunk/libs/tti/test/test_mf_has_template_fail2.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template_fail2.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_template_fail2.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -16,7 +16,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_template
<
- BOOST_TTI_TRAIT_GEN(HaveMStr)<_>,
+ HaveMStr<_>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AnotherType>
>
));
Modified: trunk/libs/tti/test/test_mf_has_template_fail4.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_template_fail4.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_template_fail4.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -16,7 +16,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_template
<
- BOOST_TTI_TRAIT_GEN(AMT)<_>,
+ AMT<_>,
boost::mpl::identity<AType>
>
));
Modified: trunk/libs/tti/test/test_mf_has_type.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_type.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_type.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_type.hpp"
#include <boost/detail/lightweight_test.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -22,7 +23,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(NameStruct)<_>,
+ NameStruct<_>,
boost::mpl::identity<AType>
>
::value
@@ -46,7 +47,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(TheInteger)<_>,
+ TheInteger<_>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
::value
@@ -74,7 +75,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(SomethingElse)<_>,
+ SomethingElse<_>,
boost::mpl::identity<AnotherType>
>
::value
@@ -82,7 +83,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnIntType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnIntType)>,
boost::mpl::identity<AType>
>
::value
@@ -90,7 +91,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(MetaFNameStruct),
+ boost::mpl::quote2<NameStruct>,
boost::mpl::identity<AType>
>
::value
@@ -98,7 +99,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnIntTypeReference),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnIntTypeReference)>,
boost::mpl::identity<AType>
>
::value
@@ -106,7 +107,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(BType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(BType)>,
boost::mpl::identity<AType>
>
::value
@@ -114,7 +115,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(MClassTheInteger),
+ boost::mpl::quote2<TheInteger>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
::value
@@ -122,7 +123,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(CType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
::value
@@ -130,10 +131,10 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnotherIntegerType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnotherIntegerType)>,
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
>
@@ -142,7 +143,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(MTFCSomethingElse),
+ boost::mpl::quote2<SomethingElse>,
boost::mpl::identity<AnotherType>
>
::value
Modified: trunk/libs/tti/test/test_mf_has_type.hpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_type.hpp (original)
+++ trunk/libs/tti/test/test_mf_has_type.hpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -22,20 +22,7 @@
BOOST_TTI_TRAIT_HAS_TYPE(SomethingElse,someOtherType)
BOOST_TTI_HAS_TYPE(NoOtherType)
-BOOST_TTI_MTFC_HAS_TYPE(AnIntType)
-BOOST_TTI_MTFC_TRAIT_HAS_TYPE(MetaFNameStruct,AStructType)
-BOOST_TTI_MTFC_HAS_TYPE(AnIntTypeReference)
-BOOST_TTI_MTFC_HAS_TYPE(BType)
-BOOST_TTI_MTFC_TRAIT_HAS_TYPE(MClassTheInteger,AnIntegerType)
-BOOST_TTI_MTFC_HAS_TYPE(CType)
-BOOST_TTI_MTFC_HAS_TYPE(AnotherIntegerType)
-
-BOOST_TTI_MTFC_TRAIT_HAS_TYPE(MTFCSomethingElse,someOtherType)
-BOOST_TTI_MTFC_HAS_TYPE(NoOtherType)
-
BOOST_TTI_MEMBER_TYPE(BType)
BOOST_TTI_MEMBER_TYPE(CType)
-BOOST_TTI_MTFC_MEMBER_TYPE(CType)
-
#endif // TEST_MF_HAS_TYPE_HPP
Modified: trunk/libs/tti/test/test_mf_has_type_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_type_compile.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_type_compile.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_type.hpp"
#include <boost/mpl/assert.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -16,7 +17,7 @@
boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnIntType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnIntType)>,
boost::mpl::identity<AnotherType>
> aVar;
@@ -37,7 +38,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(NameStruct)<_>,
+ NameStruct<_>,
boost::mpl::identity<AType>
>
));
@@ -58,7 +59,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(TheInteger)<_>,
+ TheInteger<_>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
));
@@ -83,56 +84,56 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(SomethingElse)<_>,
+ SomethingElse<_>,
boost::mpl::identity<AnotherType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnIntType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnIntType)>,
boost::mpl::identity<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(MetaFNameStruct),
+ boost::mpl::quote2<NameStruct>,
boost::mpl::identity<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnIntTypeReference),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnIntTypeReference)>,
boost::mpl::identity<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(BType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(BType)>,
boost::mpl::identity<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(MClassTheInteger),
+ boost::mpl::quote2<TheInteger>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(CType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnotherIntegerType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnotherIntegerType)>,
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
@@ -143,7 +144,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(MTFCSomethingElse),
+ boost::mpl::quote2<SomethingElse>,
boost::mpl::identity<AnotherType>
>
));
Modified: trunk/libs/tti/test/test_mf_has_type_ct.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_type_ct.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_type_ct.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_type_ct.hpp"
#include <boost/detail/lightweight_test.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -23,7 +24,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(NameStruct)<_,_>,
+ NameStruct<_,_>,
boost::mpl::identity<AType>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
@@ -50,7 +51,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(TheInteger)<_,_>,
+ TheInteger<_,_>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>,
boost::mpl::identity<int>
>
@@ -75,7 +76,7 @@
BOOST_TTI_HAS_TYPE_GEN(AnotherIntegerType)<_,_>,
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>,
boost::mpl::identity<int>
@@ -85,7 +86,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(SomethingElse)<_,_>,
+ SomethingElse<_,_>,
boost::mpl::identity<AnotherType>,
BOOST_TTI_MEMBER_TYPE_GEN(AnIntType)<AType>
>
@@ -103,7 +104,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnIntType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnIntType)>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>
>
@@ -112,7 +113,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(MFunctionNameStruct),
+ boost::mpl::quote2<NameStruct>,
boost::mpl::identity<AType>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
@@ -121,7 +122,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnIntTypeReference),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnIntTypeReference)>,
boost::mpl::identity<AType>,
boost::mpl::identity<int &>
>
@@ -130,7 +131,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(BType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(BType)>,
boost::mpl::identity<AType>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
@@ -139,7 +140,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(MFCTheInteger),
+ boost::mpl::quote2<TheInteger>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>,
boost::mpl::identity<int>
>
@@ -148,7 +149,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(CType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>,
boost::tti::mf_member_type
<
@@ -161,10 +162,10 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnotherIntegerType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnotherIntegerType)>,
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>,
boost::mpl::identity<int>
@@ -174,7 +175,7 @@
BOOST_TEST((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(FClassSomethingElse),
+ boost::mpl::quote2<SomethingElse>,
boost::mpl::identity<AnotherType>,
BOOST_TTI_MEMBER_TYPE_GEN(AnIntType)<AType>
>
@@ -183,7 +184,7 @@
BOOST_TEST((!boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(NoOtherType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(NoOtherType)>,
boost::mpl::identity<AnotherType>,
boost::mpl::identity<double>
>
Modified: trunk/libs/tti/test/test_mf_has_type_ct.hpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_type_ct.hpp (original)
+++ trunk/libs/tti/test/test_mf_has_type_ct.hpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -21,21 +21,9 @@
BOOST_TTI_TRAIT_HAS_TYPE(SomethingElse,someOtherType)
BOOST_TTI_HAS_TYPE(NoOtherType)
-BOOST_TTI_MTFC_HAS_TYPE(AnIntType)
-BOOST_TTI_MTFC_TRAIT_HAS_TYPE(MFunctionNameStruct,AStructType)
-BOOST_TTI_MTFC_HAS_TYPE(AnIntTypeReference)
-BOOST_TTI_MTFC_HAS_TYPE(BType)
-BOOST_TTI_MTFC_TRAIT_HAS_TYPE(MFCTheInteger,AnIntegerType)
-BOOST_TTI_MTFC_HAS_TYPE(CType)
-BOOST_TTI_MTFC_HAS_TYPE(AnotherIntegerType)
-BOOST_TTI_MTFC_TRAIT_HAS_TYPE(FClassSomethingElse,someOtherType)
-BOOST_TTI_MTFC_HAS_TYPE(NoOtherType)
-
BOOST_TTI_MEMBER_TYPE(AStructType)
BOOST_TTI_MEMBER_TYPE(BType)
BOOST_TTI_MEMBER_TYPE(CType)
BOOST_TTI_MEMBER_TYPE(AnIntType)
-BOOST_TTI_MTFC_MEMBER_TYPE(CType)
-
#endif // TEST_MF_HAS_TYPE_CHECK_TYPEDEF_HPP
Modified: trunk/libs/tti/test/test_mf_has_type_ct_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_type_ct_compile.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_type_ct_compile.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_has_type_ct.hpp"
#include <boost/mpl/assert.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -16,14 +17,14 @@
boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(TheInteger)<_,_>,
+ TheInteger<_,_>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AnotherType>,
boost::mpl::identity<long>
> aVar;
boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(NoOtherType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(NoOtherType)>,
boost::mpl::identity<AType>,
boost::mpl::identity<float>
> aVar2;
@@ -40,7 +41,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(NameStruct)<_,_>,
+ NameStruct<_,_>,
boost::mpl::identity<AType>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
@@ -64,7 +65,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(TheInteger)<_,_>,
+ TheInteger<_,_>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>,
boost::mpl::identity<int>
>
@@ -96,7 +97,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(SomethingElse)<_,_>,
+ SomethingElse<_,_>,
boost::mpl::identity<AnotherType>,
BOOST_TTI_MEMBER_TYPE_GEN(AnIntType)<AType>
>
@@ -104,7 +105,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnIntType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnIntType)>,
boost::mpl::identity<AType>,
boost::mpl::identity<int>
>
@@ -112,7 +113,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(MFunctionNameStruct),
+ boost::mpl::quote2<NameStruct>,
boost::mpl::identity<AType>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
@@ -120,7 +121,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnIntTypeReference),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnIntTypeReference)>,
boost::mpl::identity<AType>,
boost::mpl::identity<int &>
>
@@ -128,7 +129,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(BType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(BType)>,
boost::mpl::identity<AType>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
@@ -136,7 +137,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(MFCTheInteger),
+ boost::mpl::quote2<TheInteger>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>,
boost::mpl::identity<int>
>
@@ -144,7 +145,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(CType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>,
boost::tti::mf_member_type
<
@@ -156,10 +157,10 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_MTFC_HAS_TYPE_GEN(AnotherIntegerType),
+ boost::mpl::quote2<BOOST_TTI_HAS_TYPE_GEN(AnotherIntegerType)>,
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>,
boost::mpl::identity<int>
@@ -168,7 +169,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(FClassSomethingElse),
+ boost::mpl::quote2<SomethingElse>,
boost::mpl::identity<AnotherType>,
BOOST_TTI_MEMBER_TYPE_GEN(AnIntType)<AType>
>
Modified: trunk/libs/tti/test/test_mf_has_type_ct_fail3.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_has_type_ct_fail3.cpp (original)
+++ trunk/libs/tti/test/test_mf_has_type_ct_fail3.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -16,7 +16,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_type
<
- BOOST_TTI_TRAIT_GEN(TheInteger)<_,_>,
+ TheInteger<_,_>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>,
boost::mpl::identity<long>
>
Modified: trunk/libs/tti/test/test_mf_mem_type.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_mem_type.cpp (original)
+++ trunk/libs/tti/test/test_mf_mem_type.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_mem_type.hpp"
#include <boost/detail/lightweight_test.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -27,7 +28,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(NameStruct)<_>,
+ NameStruct<_>,
boost::mpl::identity<AType>
>
>
@@ -60,7 +61,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(TheInteger)<_>,
+ TheInteger<_>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
>
@@ -97,7 +98,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(SomethingElse)<_>,
+ SomethingElse<_>,
boost::mpl::identity<AnotherType>
>
>
@@ -108,7 +109,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(AnIntType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(AnIntType)>,
boost::mpl::identity<AType>
>
>
@@ -119,7 +120,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(MFNameStruct),
+ boost::mpl::quote1<NameStruct>,
boost::mpl::identity<AType>
>
>
@@ -130,7 +131,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(AnIntTypeReference),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(AnIntTypeReference)>,
boost::mpl::identity<AType>
>
>
@@ -141,7 +142,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(BType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(BType)>,
boost::mpl::identity<AType>
>
>
@@ -152,7 +153,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(MFTheInteger),
+ boost::mpl::quote1<TheInteger>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
>
@@ -163,7 +164,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
>
@@ -174,7 +175,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(AnotherIntegerType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(AnotherIntegerType)>,
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
@@ -189,7 +190,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(MetaClSomethingElse),
+ boost::mpl::quote1<SomethingElse>,
boost::mpl::identity<AnotherType>
>
>
Modified: trunk/libs/tti/test/test_mf_mem_type.hpp
==============================================================================
--- trunk/libs/tti/test/test_mf_mem_type.hpp (original)
+++ trunk/libs/tti/test/test_mf_mem_type.hpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -19,13 +19,4 @@
BOOST_TTI_MEMBER_TYPE(AnotherIntegerType)
BOOST_TTI_TRAIT_MEMBER_TYPE(SomethingElse,someOtherType)
-BOOST_TTI_MTFC_MEMBER_TYPE(AnIntType)
-BOOST_TTI_MTFC_TRAIT_MEMBER_TYPE(MFNameStruct,AStructType)
-BOOST_TTI_MTFC_MEMBER_TYPE(AnIntTypeReference)
-BOOST_TTI_MTFC_MEMBER_TYPE(BType)
-BOOST_TTI_MTFC_TRAIT_MEMBER_TYPE(MFTheInteger,AnIntegerType)
-BOOST_TTI_MTFC_MEMBER_TYPE(CType)
-BOOST_TTI_MTFC_MEMBER_TYPE(AnotherIntegerType)
-BOOST_TTI_MTFC_TRAIT_MEMBER_TYPE(MetaClSomethingElse,someOtherType)
-
#endif // TEST_MF_MEMBER_TYPE_HPP
Modified: trunk/libs/tti/test/test_mf_mem_type_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_mf_mem_type_compile.cpp (original)
+++ trunk/libs/tti/test/test_mf_mem_type_compile.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_mf_mem_type.hpp"
#include <boost/mpl/assert.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -26,7 +27,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(NameStruct)<_>,
+ NameStruct<_>,
boost::mpl::identity<AType>
>
>
@@ -56,7 +57,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(TheInteger)<_>,
+ TheInteger<_>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
>
@@ -90,7 +91,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(SomethingElse)<_>,
+ SomethingElse<_>,
boost::mpl::identity<AnotherType>
>
>
@@ -100,7 +101,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(AnIntType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(AnIntType)>,
boost::mpl::identity<AType>
>
>
@@ -110,7 +111,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(MFNameStruct),
+ boost::mpl::quote1<NameStruct>,
boost::mpl::identity<AType>
>
>
@@ -120,7 +121,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(AnIntTypeReference),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(AnIntTypeReference)>,
boost::mpl::identity<AType>
>
>
@@ -130,7 +131,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(BType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(BType)>,
boost::mpl::identity<AType>
>
>
@@ -140,7 +141,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(MFTheInteger),
+ boost::mpl::quote1<TheInteger>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
>
@@ -150,7 +151,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
>
@@ -160,10 +161,10 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(AnotherIntegerType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(AnotherIntegerType)>,
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
BOOST_TTI_MEMBER_TYPE_GEN(BType)<AType>
>
>
@@ -174,7 +175,7 @@
<
boost::tti::mf_member_type
<
- BOOST_TTI_TRAIT_GEN(MetaClSomethingElse),
+ boost::mpl::quote1<SomethingElse>,
boost::mpl::identity<AnotherType>
>
>
Modified: trunk/libs/tti/test/test_vm_mf_has_template_cp.cpp
==============================================================================
--- trunk/libs/tti/test/test_vm_mf_has_template_cp.cpp (original)
+++ trunk/libs/tti/test/test_vm_mf_has_template_cp.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_vm_mf_has_template_cp.hpp"
#include <boost/detail/lightweight_test.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -16,7 +17,7 @@
BOOST_TEST((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(HT_Str)<_>,
+ HT_Str<_>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
::value
@@ -32,7 +33,7 @@
BOOST_TEST((!boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(WrongParametersForMP)<_>,
+ WrongParametersForMP<_>,
boost::mpl::identity<AnotherType>
>
::value
@@ -44,7 +45,7 @@
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
::value
@@ -56,7 +57,7 @@
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
::value
@@ -64,7 +65,7 @@
BOOST_TEST((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(MF_HT_Str),
+ boost::mpl::quote1<HT_Str>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
::value
@@ -72,7 +73,7 @@
BOOST_TEST((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(AnotherMemberTemplate),
+ boost::mpl::quote1<BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(AnotherMemberTemplate)>,
boost::mpl::identity<AType>
>
::value
@@ -80,7 +81,7 @@
BOOST_TEST((!boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(AllWrongParametersForMP),
+ boost::mpl::quote1<WrongParametersForMP>,
boost::mpl::identity<AnotherType>
>
::value
@@ -88,11 +89,11 @@
BOOST_TEST((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(CTManyParameters),
+ boost::mpl::quote1<BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(CTManyParameters)>,
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
::value
@@ -100,11 +101,11 @@
BOOST_TEST((!boost::tti::mf_has_template_check_params
<
- BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist),
+ boost::mpl::quote1<BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist)>,
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
+ MT_BType<AType>
>
>
::value
Modified: trunk/libs/tti/test/test_vm_mf_has_template_cp.hpp
==============================================================================
--- trunk/libs/tti/test/test_vm_mf_has_template_cp.hpp (original)
+++ trunk/libs/tti/test/test_vm_mf_has_template_cp.hpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -21,18 +21,10 @@
BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS(CTManyParameters,class,class,int,short,class,template <class,int> class InnerTemplate,class)
BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS(TemplateNotExist,int,class)
-BOOST_TTI_VM_MTFC_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(MF_HT_Str,MStrMemberTemplate,class)
-BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS(AnotherMemberTemplate,int,int)
-BOOST_TTI_VM_MTFC_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(AllWrongParametersForMP,ManyParameters,class,class,int,class,template <class> class InnerTemplate,class,short)
-BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS(CTManyParameters,class,class,int,short,class,template <class,int> class InnerTemplate,class)
-BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS(TemplateNotExist,int,class)
-
BOOST_TTI_MEMBER_TYPE(AStructType)
BOOST_TTI_TRAIT_MEMBER_TYPE(MT_BType,BType)
BOOST_TTI_MEMBER_TYPE(CType)
-BOOST_TTI_MTFC_MEMBER_TYPE(CType)
-
#endif // BOOST_PP_VARIADICS
#endif // TEST_VM_MF_HAS_TEMPLATE_CHECK_PARAMS_HPP
Modified: trunk/libs/tti/test/test_vm_mf_has_template_cp_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_vm_mf_has_template_cp_compile.cpp (original)
+++ trunk/libs/tti/test/test_vm_mf_has_template_cp_compile.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -6,6 +6,7 @@
#include "test_vm_mf_has_template_cp.hpp"
#include <boost/mpl/assert.hpp>
+#include <boost/mpl/quote.hpp>
int main()
{
@@ -18,11 +19,11 @@
boost::tti::mf_has_template_check_params
<
- BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist),
+ boost::mpl::quote1<BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist)>,
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
> aVar;
@@ -30,7 +31,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(HT_Str)<_>,
+ HT_Str<_>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
));
@@ -47,33 +48,33 @@
BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(CTManyParameters)<_>,
boost::tti::mf_member_type
<
- BOOST_TTI_MTFC_MEMBER_TYPE_GEN(CType),
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ boost::mpl::quote1<BOOST_TTI_MEMBER_TYPE_GEN(CType)>,
+ MT_BType<AType>
>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(MF_HT_Str),
+ boost::mpl::quote1<HT_Str>,
BOOST_TTI_MEMBER_TYPE_GEN(AStructType)<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(AnotherMemberTemplate),
+ boost::mpl::quote1<BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(AnotherMemberTemplate)>,
boost::mpl::identity<AType>
>
));
BOOST_MPL_ASSERT((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_VM_MTFC_HAS_TEMPLATE_CHECK_PARAMS_GEN(CTManyParameters),
+ boost::mpl::quote1<BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(CTManyParameters)>,
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
));
Modified: trunk/libs/tti/test/test_vm_mf_has_template_cp_fail.cpp
==============================================================================
--- trunk/libs/tti/test/test_vm_mf_has_template_cp_fail.cpp (original)
+++ trunk/libs/tti/test/test_vm_mf_has_template_cp_fail.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -22,7 +22,7 @@
boost::tti::mf_member_type
<
BOOST_TTI_MEMBER_TYPE_GEN(CType)<_>,
- BOOST_TTI_TRAIT_GEN(MT_BType)<AType>
+ MT_BType<AType>
>
>
));
Modified: trunk/libs/tti/test/test_vm_mf_has_template_cp_fail3.cpp
==============================================================================
--- trunk/libs/tti/test/test_vm_mf_has_template_cp_fail3.cpp (original)
+++ trunk/libs/tti/test/test_vm_mf_has_template_cp_fail3.cpp 2011-08-21 15:05:15 EDT (Sun, 21 Aug 2011)
@@ -18,7 +18,7 @@
BOOST_MPL_ASSERT((boost::tti::mf_has_template_check_params
<
- BOOST_TTI_TRAIT_GEN(WrongParametersForMP)<_>,
+ WrongParametersForMP<_>,
boost::mpl::identity<AnotherType>
>
));
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