|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81177 - in trunk: boost/tti boost/tti/detail boost/tti/gen libs/tti/test
From: eldiener_at_[hidden]
Date: 2012-11-04 19:53:44
Author: eldiener
Date: 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
New Revision: 81177
URL: http://svn.boost.org/trac/boost/changeset/81177
Log:
Use latest BOOST_TTI_TEMPLATE changes as the default.
Text files modified:
trunk/boost/tti/detail/dtemplate.hpp | 4 +-
trunk/boost/tti/detail/dtemplate_params.hpp | 8 +++---
trunk/boost/tti/detail/dvm_template_params.hpp | 6 ++--
trunk/boost/tti/gen/has_template_check_params_gen.hpp | 2
trunk/boost/tti/gen/vm_has_template_check_params_gen.hpp | 2
trunk/boost/tti/has_template.hpp | 6 ++--
trunk/boost/tti/has_template_check_params.hpp | 4 +-
trunk/boost/tti/vm_has_template_check_params.hpp | 4 +-
trunk/libs/tti/test/Jamfile.v2 | 42 +++++++++++----------------------------
trunk/libs/tti/test/test_has_template.hpp | 10 ++++----
trunk/libs/tti/test/test_has_template_cp.cpp | 6 ++--
trunk/libs/tti/test/test_has_template_cp.hpp | 6 ++--
trunk/libs/tti/test/test_has_template_cp_compile.cpp | 6 ++--
trunk/libs/tti/test/test_has_template_cp_fail.cpp | 6 ++--
trunk/libs/tti/test/test_vm_has_template_cp.cpp | 6 ++--
trunk/libs/tti/test/test_vm_has_template_cp.hpp | 6 ++--
trunk/libs/tti/test/test_vm_has_template_cp_compile.cpp | 6 ++--
trunk/libs/tti/test/test_vm_has_template_cp_fail.cpp | 6 ++--
18 files changed, 59 insertions(+), 77 deletions(-)
Modified: trunk/boost/tti/detail/dtemplate.hpp
==============================================================================
--- trunk/boost/tti/detail/dtemplate.hpp (original)
+++ trunk/boost/tti/detail/dtemplate.hpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -7,7 +7,7 @@
#if !defined(TTI_DETAIL_TEMPLATE_HPP)
#define TTI_DETAIL_TEMPLATE_HPP
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
#include <boost/config.hpp>
#include <boost/mpl/has_xxx.hpp>
@@ -47,5 +47,5 @@
}; \
/**/
-#endif // BOOST_TTI_VERSION_1_6
+#endif // !BOOST_TTI_VERSION_1_5
#endif // !TTI_DETAIL_TEMPLATE_HPP
Modified: trunk/boost/tti/detail/dtemplate_params.hpp
==============================================================================
--- trunk/boost/tti/detail/dtemplate_params.hpp (original)
+++ trunk/boost/tti/detail/dtemplate_params.hpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -18,7 +18,7 @@
#include <boost/preprocessor/repetition/repeat.hpp>
#include <boost/preprocessor/repetition/enum.hpp>
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
#include <boost/preprocessor/array/enum.hpp>
#include <boost/preprocessor/array/size.hpp>
@@ -196,7 +196,7 @@
#endif // !BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
#define TTI_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(trait,name,tpArray) \
TTI_DETAIL_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(BOOST_PP_CAT(trait,_detail),name,tpArray) \
@@ -229,7 +229,7 @@
#endif // !BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
#endif // !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE)
-#else // !BOOST_TTI_VERSION_1_6
+#else // BOOST_TTI_VERSION_1_5
#if !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE)
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
@@ -253,6 +253,6 @@
#endif // !BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
#endif // !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE)
-#endif // BOOST_TTI_VERSION_1_6
+#endif // !BOOST_TTI_VERSION_1_5
#endif // TTI_DETAIL_TEMPLATE_PARAMS_HPP
Modified: trunk/boost/tti/detail/dvm_template_params.hpp
==============================================================================
--- trunk/boost/tti/detail/dvm_template_params.hpp (original)
+++ trunk/boost/tti/detail/dvm_template_params.hpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -18,7 +18,7 @@
#include <boost/preprocessor/variadic/size.hpp>
#include "dtemplate_params.hpp"
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/comparison/equal.hpp>
@@ -61,7 +61,7 @@
#endif // !defined(BOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE)
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
#define TTI_VM_DETAIL_CHECK_MORE_THAN_TWO(trait,...) \
BOOST_PP_IIF \
@@ -150,7 +150,7 @@
}; \
/**/
-#endif // BOOST_TTI_VERSION_1_6
+#endif // !BOOST_TTI_VERSION_1_5
#endif // BOOST_PP_VARIADICS
Modified: trunk/boost/tti/gen/has_template_check_params_gen.hpp
==============================================================================
--- trunk/boost/tti/gen/has_template_check_params_gen.hpp (original)
+++ trunk/boost/tti/gen/has_template_check_params_gen.hpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -7,7 +7,7 @@
#if !defined(TTI_TEMPLATE_PARAMS_GEN_HPP)
#define TTI_TEMPLATE_PARAMS_GEN_HPP
-#if !defined(BOOST_TTI_VERSION_1_6)
+#if defined(BOOST_TTI_VERSION_1_5)
#include <boost/preprocessor/cat.hpp>
Modified: trunk/boost/tti/gen/vm_has_template_check_params_gen.hpp
==============================================================================
--- trunk/boost/tti/gen/vm_has_template_check_params_gen.hpp (original)
+++ trunk/boost/tti/gen/vm_has_template_check_params_gen.hpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -7,7 +7,7 @@
#if !defined(TTI_VM_TEMPLATE_PARAMS_GEN_HPP)
#define TTI_VM_TEMPLATE_PARAMS_GEN_HPP
-#if !defined(BOOST_TTI_VERSION_1_6)
+#if defined(BOOST_TTI_VERSION_1_5)
#include <boost/preprocessor/config/config.hpp>
Modified: trunk/boost/tti/has_template.hpp
==============================================================================
--- trunk/boost/tti/has_template.hpp (original)
+++ trunk/boost/tti/has_template.hpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -19,7 +19,7 @@
#include <boost/config.hpp>
#include <boost/tti/gen/has_template_gen.hpp>
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
#include <boost/preprocessor/config/config.hpp>
#include <boost/preprocessor/control/iif.hpp>
@@ -83,7 +83,7 @@
#endif // BOOST_PP_VARIADICS
-#else // !BOOST_TTI_VERSION_1_6
+#else // BOOST_TTI_VERSION_1_5
#include <boost/mpl/has_xxx.hpp>
#include <boost/preprocessor/cat.hpp>
@@ -155,5 +155,5 @@
) \
/**/
-#endif // BOOST_TTI_VERSION_1_6
+#endif // BOOST_TTI_VERSION_1_5
#endif // TTI_HAS_TEMPLATE_HPP
Modified: trunk/boost/tti/has_template_check_params.hpp
==============================================================================
--- trunk/boost/tti/has_template_check_params.hpp (original)
+++ trunk/boost/tti/has_template_check_params.hpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -7,7 +7,7 @@
#if !defined(TTI_HAS_TEMPLATE_CHECK_PARAMS_HPP)
#define TTI_HAS_TEMPLATE_CHECK_PARAMS_HPP
-#if !defined(BOOST_TTI_VERSION_1_6)
+#if defined(BOOST_TTI_VERSION_1_5)
#include <boost/config.hpp>
#include <boost/preprocessor/cat.hpp>
@@ -97,5 +97,5 @@
) \
/**/
-#endif // !BOOST_TTI_VERSION_1_6
+#endif // BOOST_TTI_VERSION_1_5
#endif // !TTI_HAS_TEMPLATE_CHECK_PARAMS_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-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -7,7 +7,7 @@
#if !defined(TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_HPP)
#define TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_HPP
-#if !defined(BOOST_TTI_VERSION_1_6)
+#if defined(BOOST_TTI_VERSION_1_5)
#include <boost/preprocessor/config/config.hpp>
@@ -99,5 +99,5 @@
/**/
#endif // BOOST_PP_VARIADICS
-#endif // !BOOST_TTI_VERSION_1_6
+#endif // BOOST_TTI_VERSION_1_5
#endif // TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_HPP
Modified: trunk/libs/tti/test/Jamfile.v2
==============================================================================
--- trunk/libs/tti/test/Jamfile.v2 (original)
+++ trunk/libs/tti/test/Jamfile.v2 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -71,12 +71,12 @@
alias ttitmp
:
- [ run test_has_template.cpp : : : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
- [ compile test_has_template_compile.cpp : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
- [ compile-fail test_has_template_fail.cpp : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
- [ compile-fail test_has_template_fail2.cpp : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
- [ compile-fail test_has_template_fail3.cpp : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
- [ compile-fail test_has_template_fail4.cpp : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
+ [ run test_has_template.cpp : : : <define>BOOST_PP_VARIADICS=0 ]
+ [ compile test_has_template_compile.cpp : <define>BOOST_PP_VARIADICS=0 ]
+ [ compile-fail test_has_template_fail.cpp : <define>BOOST_PP_VARIADICS=0 ]
+ [ compile-fail test_has_template_fail2.cpp : <define>BOOST_PP_VARIADICS=0 ]
+ [ compile-fail test_has_template_fail3.cpp : <define>BOOST_PP_VARIADICS=0 ]
+ [ compile-fail test_has_template_fail4.cpp : <define>BOOST_PP_VARIADICS=0 ]
;
alias ttitmpv : :
@@ -99,7 +99,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_v ]
[ compile test_has_template_compile.cpp :
@@ -110,7 +109,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_compile_v ]
[ compile-fail test_has_template_fail.cpp :
@@ -121,7 +119,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_fail_v ]
[ compile-fail test_has_template_fail2.cpp :
@@ -132,7 +129,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_fail2_v ]
[ compile-fail test_has_template_fail3.cpp :
@@ -143,7 +139,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_fail3_v ]
[ compile-fail test_has_template_fail4.cpp :
@@ -154,19 +149,18 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_fail4_v ]
;
alias ttitmpcp
:
- [ run test_has_template_cp.cpp : : : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
- [ compile test_has_template_cp_compile.cpp : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
- [ compile-fail test_has_template_cp_fail.cpp : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
- [ compile-fail test_has_template_cp_fail2.cpp : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
- [ compile-fail test_has_template_cp_fail3.cpp : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
- [ compile-fail test_has_template_cp_fail4.cpp : <define>BOOST_TTI_VERSION_1_6 <define>BOOST_PP_VARIADICS=0 ]
+ [ run test_has_template_cp.cpp : : : <define>BOOST_PP_VARIADICS=0 ]
+ [ compile test_has_template_cp_compile.cpp : <define>BOOST_PP_VARIADICS=0 ]
+ [ compile-fail test_has_template_cp_fail.cpp : <define>BOOST_PP_VARIADICS=0 ]
+ [ compile-fail test_has_template_cp_fail2.cpp : <define>BOOST_PP_VARIADICS=0 ]
+ [ compile-fail test_has_template_cp_fail3.cpp : <define>BOOST_PP_VARIADICS=0 ]
+ [ compile-fail test_has_template_cp_fail4.cpp : <define>BOOST_PP_VARIADICS=0 ]
;
alias ttitmpcpv : :
@@ -189,7 +183,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_cp_v ]
[ compile test_has_template_cp_compile.cpp :
@@ -200,7 +193,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_cp_compile_v ]
[ compile-fail test_has_template_cp_fail.cpp :
@@ -211,7 +203,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_cp_fail_v ]
[ compile-fail test_has_template_cp_fail2.cpp :
@@ -222,7 +213,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_cp_fail2_v ]
[ compile-fail test_has_template_cp_fail3.cpp :
@@ -233,7 +223,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_cp_fail3_v ]
[ compile-fail test_has_template_cp_fail4.cpp :
@@ -244,7 +233,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 :
test_has_template_cp_fail4_v ]
;
@@ -294,7 +282,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 ]
[ compile test_vm_has_template_cp_compile.cpp :
<toolset>gcc-4.3.0:<cxxflags>-std=c++0x
@@ -304,7 +291,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 ]
[ compile-fail test_vm_has_template_cp_fail.cpp :
<toolset>gcc-4.3.0:<cxxflags>-std=c++0x
@@ -314,7 +300,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 ]
[ compile-fail test_vm_has_template_cp_fail2.cpp :
<toolset>gcc-4.3.0:<cxxflags>-std=c++0x
@@ -324,7 +309,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 ]
[ compile-fail test_vm_has_template_cp_fail3.cpp :
<toolset>gcc-4.3.0:<cxxflags>-std=c++0x
@@ -334,7 +318,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 ]
[ compile-fail test_vm_has_template_cp_fail4.cpp :
<toolset>gcc-4.3.0:<cxxflags>-std=c++0x
@@ -344,7 +327,6 @@
<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_TTI_VERSION_1_6
<define>BOOST_PP_VARIADICS=1 ]
;
Modified: trunk/libs/tti/test/test_has_template.hpp
==============================================================================
--- trunk/libs/tti/test/test_has_template.hpp (original)
+++ trunk/libs/tti/test/test_has_template.hpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -10,7 +10,7 @@
#include "test_structs.hpp"
#include <boost/tti/has_template.hpp>
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
#if BOOST_PP_VARIADICS
@@ -23,7 +23,7 @@
BOOST_TTI_HAS_TEMPLATE(SimpleTMP,BOOST_PP_NIL)
BOOST_TTI_HAS_TEMPLATE(TemplateNotExist)
-#else
+#else // !BOOST_PP_VARIADICS
BOOST_TTI_HAS_TEMPLATE(ATPMemberTemplate,BOOST_PP_NIL)
BOOST_TTI_TRAIT_HAS_TEMPLATE(HaveCL,CLMemberTemplate,BOOST_PP_NIL)
@@ -34,9 +34,9 @@
BOOST_TTI_HAS_TEMPLATE(SimpleTMP,BOOST_PP_NIL)
BOOST_TTI_HAS_TEMPLATE(TemplateNotExist,BOOST_PP_NIL)
-#endif
+#endif // BOOST_PP_VARIADICS
-#else // !(BOOST_TTI_VERSION_1_6)
+#else // BOOST_TTI_VERSION_1_5
BOOST_TTI_HAS_TEMPLATE(ATPMemberTemplate)
BOOST_TTI_TRAIT_HAS_TEMPLATE(HaveCL,CLMemberTemplate)
@@ -47,6 +47,6 @@
BOOST_TTI_HAS_TEMPLATE(SimpleTMP)
BOOST_TTI_HAS_TEMPLATE(TemplateNotExist)
-#endif // BOOST_TTI_VERSION_1_6 && !BOOST_PP_VARIADICS
+#endif // !BOOST_TTI_VERSION_1_5
#endif // TEST_HAS_TEMPLATE_HPP
Modified: trunk/libs/tti/test/test_has_template_cp.cpp
==============================================================================
--- trunk/libs/tti/test/test_has_template_cp.cpp (original)
+++ trunk/libs/tti/test/test_has_template_cp.cpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -10,7 +10,7 @@
int main()
{
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
BOOST_TEST(BOOST_TTI_HAS_TEMPLATE_GEN(ATPMemberTemplate)<AType>::value);
BOOST_TEST(BOOST_TTI_HAS_TEMPLATE_GEN(AMemberTemplate)<AType>::value);
@@ -18,7 +18,7 @@
BOOST_TEST(BOOST_TTI_HAS_TEMPLATE_GEN(SimpleTMP)<AnotherType>::value);
BOOST_TEST(!BOOST_TTI_HAS_TEMPLATE_GEN(TemplateNotExist)<AnotherType>::value);
-#else // !BOOST_TTI_VERSION_1_6
+#else // BOOST_TTI_VERSION_1_5
BOOST_TEST(BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(ATPMemberTemplate)<AType>::value);
BOOST_TEST(BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(AMemberTemplate)<AType>::value);
@@ -26,7 +26,7 @@
BOOST_TEST(BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(SimpleTMP)<AnotherType>::value);
BOOST_TEST(!BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist)<AnotherType>::value);
-#endif // BOOST_TTI_VERSION_1_6
+#endif // !BOOST_TTI_VERSION_1_5
BOOST_TEST(HaveCL<AType>::value);
BOOST_TEST(HaveAnotherMT<AType>::value);
Modified: trunk/libs/tti/test/test_has_template_cp.hpp
==============================================================================
--- trunk/libs/tti/test/test_has_template_cp.hpp (original)
+++ trunk/libs/tti/test/test_has_template_cp.hpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -9,7 +9,7 @@
#include "test_structs.hpp"
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
#include <boost/tti/has_template.hpp>
@@ -24,7 +24,7 @@
BOOST_TTI_TRAIT_HAS_TEMPLATE(WrongParametersForMP,ManyParameters,(8,(class,class,int,class,template <class,class> class InnerTemplate,class,long)))
BOOST_TTI_TRAIT_HAS_TEMPLATE(WrongParameters2ForMP,ManyParameters,(7,(class,long,int,class,template <class> class InnerTemplate,class,long)))
-#else // !BOOST_TTI_VERSION_1_6
+#else // BOOST_TTI_VERSION_1_5
#include <boost/tti/has_template_check_params.hpp>
@@ -39,6 +39,6 @@
BOOST_TTI_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(WrongParametersForMP,ManyParameters,(class)(class)(int)(class)(template <class)(class> class InnerTemplate)(class)(long))
BOOST_TTI_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(WrongParameters2ForMP,ManyParameters,(class)(long)(int)(class)(template <class> class InnerTemplate)(class)(long))
-#endif // BOOST_TTI_VERSION_1_6
+#endif // !BOOST_TTI_VERSION_1_5
#endif // TEST_HAS_TEMPLATE_CHECK_PARAMS_HPP
Modified: trunk/libs/tti/test/test_has_template_cp_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_has_template_cp_compile.cpp (original)
+++ trunk/libs/tti/test/test_has_template_cp_compile.cpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -10,7 +10,7 @@
int main()
{
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
// You can always instantiate without compiler errors
@@ -23,7 +23,7 @@
BOOST_MPL_ASSERT((BOOST_TTI_HAS_TEMPLATE_GEN(SomeMemberTemplate)<AnotherType>));
BOOST_MPL_ASSERT((BOOST_TTI_HAS_TEMPLATE_GEN(SimpleTMP)<AnotherType>));
-#else
+#else // BOOST_TTI_VERSION_1_5
// You can always instantiate without compiler errors
@@ -36,7 +36,7 @@
BOOST_MPL_ASSERT((BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(SomeMemberTemplate)<AnotherType>));
BOOST_MPL_ASSERT((BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(SimpleTMP)<AnotherType>));
-#endif
+#endif // !BOOST_TTI_VERSION_1_5
BOOST_MPL_ASSERT((HaveCL<AType>));
BOOST_MPL_ASSERT((HaveAnotherMT<AType>));
Modified: trunk/libs/tti/test/test_has_template_cp_fail.cpp
==============================================================================
--- trunk/libs/tti/test/test_has_template_cp_fail.cpp (original)
+++ trunk/libs/tti/test/test_has_template_cp_fail.cpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -11,19 +11,19 @@
{
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
// TemplateNotExist does not exist at all
BOOST_MPL_ASSERT((BOOST_TTI_HAS_TEMPLATE_GEN(TemplateNotExist)<AType>));
-#else
+#else // BOOST_TTI_VERSION_1_5
// TemplateNotExist does not exist at all
BOOST_MPL_ASSERT((BOOST_TTI_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist)<AType>));
-#endif
+#endif // !BOOST_TTI_VERSION_1_5
return 0;
Modified: trunk/libs/tti/test/test_vm_has_template_cp.cpp
==============================================================================
--- trunk/libs/tti/test/test_vm_has_template_cp.cpp (original)
+++ trunk/libs/tti/test/test_vm_has_template_cp.cpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -12,7 +12,7 @@
#if BOOST_PP_VARIADICS
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
BOOST_TEST(BOOST_TTI_HAS_TEMPLATE_GEN(ATPMemberTemplate)<AType>::value);
BOOST_TEST(BOOST_TTI_HAS_TEMPLATE_GEN(AMemberTemplate)<AType>::value);
@@ -20,7 +20,7 @@
BOOST_TEST(BOOST_TTI_HAS_TEMPLATE_GEN(SimpleTMP)<AnotherType>::value);
BOOST_TEST(!BOOST_TTI_HAS_TEMPLATE_GEN(TemplateNotExist)<AnotherType>::value);
-#else
+#else // BOOST_TTI_VERSION_1_5
BOOST_TEST(BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(ATPMemberTemplate)<AType>::value);
BOOST_TEST(BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(AMemberTemplate)<AType>::value);
@@ -28,7 +28,7 @@
BOOST_TEST(BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(SimpleTMP)<AnotherType>::value);
BOOST_TEST(!BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist)<AnotherType>::value);
-#endif
+#endif // !BOOST_TTI_VERSION_1_5
BOOST_TEST(HaveCL<AType>::value);
BOOST_TEST(HaveAnotherMT<AType>::value);
Modified: trunk/libs/tti/test/test_vm_has_template_cp.hpp
==============================================================================
--- trunk/libs/tti/test/test_vm_has_template_cp.hpp (original)
+++ trunk/libs/tti/test/test_vm_has_template_cp.hpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -13,7 +13,7 @@
#include "test_structs.hpp"
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
#include <boost/tti/has_template.hpp>
@@ -28,7 +28,7 @@
BOOST_TTI_TRAIT_HAS_TEMPLATE(WrongParametersForMP,ManyParameters,class,class,int,class,template <class,class> class InnerTemplate,class,long)
BOOST_TTI_TRAIT_HAS_TEMPLATE(WrongParameters2ForMP,ManyParameters,class,long,int,class,template <class> class InnerTemplate,class,long)
-#else // !BOOST_TTI_VERSION_1_6
+#else // BOOST_TTI_VERSION_1_5
#include <boost/tti/vm_has_template_check_params.hpp>
@@ -43,7 +43,7 @@
BOOST_TTI_VM_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(WrongParametersForMP,ManyParameters,class,class,int,class,template <class,class> class InnerTemplate,class,long)
BOOST_TTI_VM_TRAIT_HAS_TEMPLATE_CHECK_PARAMS(WrongParameters2ForMP,ManyParameters,class,long,int,class,template <class> class InnerTemplate,class,long)
-#endif // BOOST_TTI_VERSION_1_6
+#endif // !BOOST_TTI_VERSION_1_5
#endif // BOOST_PP_VARIADICS
Modified: trunk/libs/tti/test/test_vm_has_template_cp_compile.cpp
==============================================================================
--- trunk/libs/tti/test/test_vm_has_template_cp_compile.cpp (original)
+++ trunk/libs/tti/test/test_vm_has_template_cp_compile.cpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -12,7 +12,7 @@
#if BOOST_PP_VARIADICS
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
// You can always instantiate without compiler errors
@@ -25,7 +25,7 @@
BOOST_MPL_ASSERT((BOOST_TTI_HAS_TEMPLATE_GEN(SomeMemberTemplate)<AnotherType>));
BOOST_MPL_ASSERT((BOOST_TTI_HAS_TEMPLATE_GEN(SimpleTMP)<AnotherType>));
-#else
+#else // BOOST_TTI_VERSION_1_5
// You can always instantiate without compiler errors
@@ -38,7 +38,7 @@
BOOST_MPL_ASSERT((BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(SomeMemberTemplate)<AnotherType>));
BOOST_MPL_ASSERT((BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(SimpleTMP)<AnotherType>));
-#endif
+#endif // !BOOST_TTI_VERSION_1_5
BOOST_MPL_ASSERT((HaveCL<AType>));
BOOST_MPL_ASSERT((HaveAnotherMT<AType>));
Modified: trunk/libs/tti/test/test_vm_has_template_cp_fail.cpp
==============================================================================
--- trunk/libs/tti/test/test_vm_has_template_cp_fail.cpp (original)
+++ trunk/libs/tti/test/test_vm_has_template_cp_fail.cpp 2012-11-04 19:53:42 EST (Sun, 04 Nov 2012)
@@ -12,19 +12,19 @@
#if BOOST_PP_VARIADICS
-#if defined(BOOST_TTI_VERSION_1_6)
+#if !defined(BOOST_TTI_VERSION_1_5)
// TemplateNotExist does not exist at all
BOOST_MPL_ASSERT((BOOST_TTI_HAS_TEMPLATE_GEN(TemplateNotExist)<AType>));
-#else
+#else // BOOST_TTI_VERSION_1_5
// TemplateNotExist does not exist at all
BOOST_MPL_ASSERT((BOOST_TTI_VM_HAS_TEMPLATE_CHECK_PARAMS_GEN(TemplateNotExist)<AType>));
-#endif
+#endif // !BOOST_TTI_VERSION_1_5
#else
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