From 5e66227e35c492bd5e932a175669f9be0895dd54 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Tue, 4 Nov 2003 11:32:42 +0000 Subject: [PATCH] Changed header include form so that it won't break bjam dependency analysis anymore. [SVN r20636] --- test/add_const_test.cpp | 6 +++++- test/add_pointer_test.cpp | 6 +++++- test/add_reference_test.cpp | 6 +++++- test/add_volatile_test.cpp | 6 +++++- test/alignment_of_test.cpp | 6 +++++- test/function_traits_test.cpp | 6 +++++- test/has_nothrow_assign_test.cpp | 6 +++++- test/has_nothrow_constr_test.cpp | 6 +++++- test/has_nothrow_copy_test.cpp | 6 +++++- test/has_trivial_assign_test.cpp | 6 +++++- test/has_trivial_constr_test.cpp | 6 +++++- test/has_trivial_copy_test.cpp | 6 +++++- test/has_trivial_destructor_test.cpp | 6 +++++- test/is_arithmetic_test.cpp | 6 +++++- test/is_array_test.cpp | 6 +++++- test/is_base_and_derived_test.cpp | 6 +++++- test/is_class_test.cpp | 6 +++++- test/is_compound_test.cpp | 6 +++++- test/is_const_test.cpp | 6 +++++- test/is_convertible_test.cpp | 6 +++++- test/is_empty_test.cpp | 6 +++++- test/is_enum_test.cpp | 6 +++++- test/is_float_test.cpp | 6 +++++- test/is_function_test.cpp | 6 +++++- test/is_fundamental_test.cpp | 6 +++++- test/is_integral_test.cpp | 6 +++++- test/is_member_func_test.cpp | 6 +++++- test/is_member_pointer_test.cpp | 6 +++++- test/is_object_test.cpp | 6 +++++- test/is_pod_test.cpp | 6 +++++- test/is_pointer_test.cpp | 6 +++++- test/is_polymorphic_test.cpp | 6 +++++- test/is_reference_test.cpp | 6 +++++- test/is_same_test.cpp | 6 +++++- test/is_scalar_test.cpp | 6 +++++- test/is_stateless_test.cpp | 6 +++++- test/is_union_test.cpp | 6 +++++- test/is_void_test.cpp | 6 +++++- test/is_volatile_test.cpp | 6 +++++- test/remove_bounds_test.cpp | 6 +++++- test/remove_const_test.cpp | 6 +++++- test/remove_cv_test.cpp | 6 +++++- test/remove_pointer_test.cpp | 6 +++++- test/remove_reference_test.cpp | 6 +++++- test/remove_volatile_test.cpp | 6 +++++- test/test.hpp | 12 ++++++------ test/tricky_abstract_type_test.cpp | 8 ++++++-- test/tricky_add_pointer_test.cpp | 6 +++++- test/tricky_function_type_test.cpp | 28 ++++++++++++++++------------ test/tricky_incomplete_type_test.cpp | 6 +++++- test/tricky_is_enum_test.cpp | 6 +++++- test/tricky_partial_spec_test.cpp | 20 ++++++++++++-------- test/type_with_alignment_test.cpp | 11 +++++++---- 53 files changed, 287 insertions(+), 80 deletions(-) diff --git a/test/add_const_test.cpp b/test/add_const_test.cpp index 385a82e..dd97d7b 100644 --- a/test/add_const_test.cpp +++ b/test/add_const_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(add_const) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST(add_const_test_1, ::boost::add_const, const, const) BOOST_DECL_TRANSFORM_TEST(add_const_test_2, ::boost::add_const, volatile, volatile const) diff --git a/test/add_pointer_test.cpp b/test/add_pointer_test.cpp index 6305c99..caf61de 100644 --- a/test/add_pointer_test.cpp +++ b/test/add_pointer_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(add_pointer) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST(add_pointer_test_1, ::boost::add_pointer, const, const*) BOOST_DECL_TRANSFORM_TEST(add_pointer_test_2, ::boost::add_pointer, volatile, volatile*) diff --git a/test/add_reference_test.cpp b/test/add_reference_test.cpp index e898ed0..439d7e6 100644 --- a/test/add_reference_test.cpp +++ b/test/add_reference_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(add_reference) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST(add_reference_test_1, ::boost::add_reference, const, const&) BOOST_DECL_TRANSFORM_TEST(add_reference_test_2, ::boost::add_reference, volatile, volatile&) diff --git a/test/add_volatile_test.cpp b/test/add_volatile_test.cpp index 0614398..79d51e2 100644 --- a/test/add_volatile_test.cpp +++ b/test/add_volatile_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(add_volatile) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST(add_volatile_test_1, ::boost::add_volatile, const, const volatile) BOOST_DECL_TRANSFORM_TEST(add_volatile_test_2, ::boost::add_volatile, volatile, volatile) diff --git a/test/alignment_of_test.cpp b/test/alignment_of_test.cpp index 535d4c9..852b77b 100644 --- a/test/alignment_of_test.cpp +++ b/test/alignment_of_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(alignment_of) +#ifdef TEST_STD +# include +#else +# include +#endif // // VC++ emits an awful lot of warnings unless we define these: diff --git a/test/function_traits_test.cpp b/test/function_traits_test.cpp index 61a31f8..f08e810 100644 --- a/test/function_traits_test.cpp +++ b/test/function_traits_test.cpp @@ -7,7 +7,11 @@ #include "test.hpp" #include "check_type.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(function_traits) +#ifdef TEST_STD +# include +#else +# include +#endif typedef void(pf_zero1)(); typedef int(pf_zero2)(); diff --git a/test/has_nothrow_assign_test.cpp b/test/has_nothrow_assign_test.cpp index 590342f..c283b1d 100644 --- a/test/has_nothrow_assign_test.cpp +++ b/test/has_nothrow_assign_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(has_nothrow_assign) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(has_nothrow_assign) diff --git a/test/has_nothrow_constr_test.cpp b/test/has_nothrow_constr_test.cpp index b055451..a858dec 100644 --- a/test/has_nothrow_constr_test.cpp +++ b/test/has_nothrow_constr_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(has_nothrow_constructor) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(has_nothrow_constructor) diff --git a/test/has_nothrow_copy_test.cpp b/test/has_nothrow_copy_test.cpp index 3206d23..6e88146 100644 --- a/test/has_nothrow_copy_test.cpp +++ b/test/has_nothrow_copy_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(has_nothrow_copy) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(has_nothrow_copy) diff --git a/test/has_trivial_assign_test.cpp b/test/has_trivial_assign_test.cpp index bb4bfbc..08da59b 100644 --- a/test/has_trivial_assign_test.cpp +++ b/test/has_trivial_assign_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(has_trivial_assign) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(has_trivial_assign) diff --git a/test/has_trivial_constr_test.cpp b/test/has_trivial_constr_test.cpp index 1a91e24..d006f91 100644 --- a/test/has_trivial_constr_test.cpp +++ b/test/has_trivial_constr_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(has_trivial_constructor) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(has_trivial_constructor) diff --git a/test/has_trivial_copy_test.cpp b/test/has_trivial_copy_test.cpp index 5dfcc1f..73a251a 100644 --- a/test/has_trivial_copy_test.cpp +++ b/test/has_trivial_copy_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(has_trivial_copy) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(has_trivial_copy) diff --git a/test/has_trivial_destructor_test.cpp b/test/has_trivial_destructor_test.cpp index 653f348..e8c3156 100644 --- a/test/has_trivial_destructor_test.cpp +++ b/test/has_trivial_destructor_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(has_trivial_destructor) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(has_trivial_destructor) diff --git a/test/is_arithmetic_test.cpp b/test/is_arithmetic_test.cpp index 28a8d86..67221ee 100644 --- a/test/is_arithmetic_test.cpp +++ b/test/is_arithmetic_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_arithmetic) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_arithmetic) diff --git a/test/is_array_test.cpp b/test/is_array_test.cpp index 5aa70fa..4947ba1 100644 --- a/test/is_array_test.cpp +++ b/test/is_array_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_array) +#ifdef TEST_STD +# include +#else +# include +#endif struct convertible_to_pointer { diff --git a/test/is_base_and_derived_test.cpp b/test/is_base_and_derived_test.cpp index d0fe016..9dffb07 100644 --- a/test/is_base_and_derived_test.cpp +++ b/test/is_base_and_derived_test.cpp @@ -7,7 +7,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_base_and_derived) +#ifdef TEST_STD +# include +#else +# include +#endif diff --git a/test/is_class_test.cpp b/test/is_class_test.cpp index 42ea8ba..c2905ac 100644 --- a/test/is_class_test.cpp +++ b/test/is_class_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_class) +#ifdef TEST_STD +# include +#else +# include +#endif #include TT_TEST_BEGIN(is_class) diff --git a/test/is_compound_test.cpp b/test/is_compound_test.cpp index adbfabb..a5b40fd 100644 --- a/test/is_compound_test.cpp +++ b/test/is_compound_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_compound) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_compound) diff --git a/test/is_const_test.cpp b/test/is_const_test.cpp index 4862fda..6c8828a 100644 --- a/test/is_const_test.cpp +++ b/test/is_const_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_const) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_const) diff --git a/test/is_convertible_test.cpp b/test/is_convertible_test.cpp index fa45f7f..14fb783 100644 --- a/test/is_convertible_test.cpp +++ b/test/is_convertible_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_COMPARE(is_convertible) +#ifdef TEST_STD +# include +#else +# include +#endif template struct convertible_from diff --git a/test/is_empty_test.cpp b/test/is_empty_test.cpp index b673eb2..337e072 100644 --- a/test/is_empty_test.cpp +++ b/test/is_empty_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_empty) +#ifdef TEST_STD +# include +#else +# include +#endif struct non_default_constructable_UDT { diff --git a/test/is_enum_test.cpp b/test/is_enum_test.cpp index dd7a8ec..019eead 100644 --- a/test/is_enum_test.cpp +++ b/test/is_enum_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_enum) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_enum) diff --git a/test/is_float_test.cpp b/test/is_float_test.cpp index 7849151..f416581 100644 --- a/test/is_float_test.cpp +++ b/test/is_float_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_float) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_float) diff --git a/test/is_function_test.cpp b/test/is_function_test.cpp index 0ada133..f5f3254 100644 --- a/test/is_function_test.cpp +++ b/test/is_function_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_function) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_function) diff --git a/test/is_fundamental_test.cpp b/test/is_fundamental_test.cpp index 6cbd841..0565c97 100644 --- a/test/is_fundamental_test.cpp +++ b/test/is_fundamental_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_fundamental) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_fundamental) diff --git a/test/is_integral_test.cpp b/test/is_integral_test.cpp index 7f03c54..88bec86 100644 --- a/test/is_integral_test.cpp +++ b/test/is_integral_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_integral) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_integral) diff --git a/test/is_member_func_test.cpp b/test/is_member_func_test.cpp index 70a1b33..4cc6e63 100644 --- a/test/is_member_func_test.cpp +++ b/test/is_member_func_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_member_function_pointer) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_member_function_pointer) diff --git a/test/is_member_pointer_test.cpp b/test/is_member_pointer_test.cpp index 2116c53..049be29 100644 --- a/test/is_member_pointer_test.cpp +++ b/test/is_member_pointer_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_member_pointer) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_member_pointer) diff --git a/test/is_object_test.cpp b/test/is_object_test.cpp index b067950..fb45268 100644 --- a/test/is_object_test.cpp +++ b/test/is_object_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_object) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_object) diff --git a/test/is_pod_test.cpp b/test/is_pod_test.cpp index c658d3d..65c4b3f 100644 --- a/test/is_pod_test.cpp +++ b/test/is_pod_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_pod) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_pod) diff --git a/test/is_pointer_test.cpp b/test/is_pointer_test.cpp index 659fd5e..720e1dc 100644 --- a/test/is_pointer_test.cpp +++ b/test/is_pointer_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_pointer) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_pointer) diff --git a/test/is_polymorphic_test.cpp b/test/is_polymorphic_test.cpp index 2d0795a..afa3e58 100644 --- a/test/is_polymorphic_test.cpp +++ b/test/is_polymorphic_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_polymorphic) +#ifdef TEST_STD +# include +#else +# include +#endif #include #include diff --git a/test/is_reference_test.cpp b/test/is_reference_test.cpp index 7db7056..dd91187 100644 --- a/test/is_reference_test.cpp +++ b/test/is_reference_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_reference) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_reference) diff --git a/test/is_same_test.cpp b/test/is_same_test.cpp index 9732a26..7eb784b 100644 --- a/test/is_same_test.cpp +++ b/test/is_same_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_COMPARE(is_same) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_same) diff --git a/test/is_scalar_test.cpp b/test/is_scalar_test.cpp index 16c68a9..e5e4ec2 100644 --- a/test/is_scalar_test.cpp +++ b/test/is_scalar_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_scalar) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_scalar) diff --git a/test/is_stateless_test.cpp b/test/is_stateless_test.cpp index 95f2c75..1c90b0c 100644 --- a/test/is_stateless_test.cpp +++ b/test/is_stateless_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_stateless) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_stateless) diff --git a/test/is_union_test.cpp b/test/is_union_test.cpp index f63183b..5985704 100644 --- a/test/is_union_test.cpp +++ b/test/is_union_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_union) +#ifdef TEST_STD +# include +#else +# include +#endif #include TT_TEST_BEGIN(is_union) diff --git a/test/is_void_test.cpp b/test/is_void_test.cpp index 0f83c1b..9bfde67 100644 --- a/test/is_void_test.cpp +++ b/test/is_void_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_void) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_void) diff --git a/test/is_volatile_test.cpp b/test/is_volatile_test.cpp index 67fe60a..627f18b 100644 --- a/test/is_volatile_test.cpp +++ b/test/is_volatile_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_volatile) +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(is_volatile) diff --git a/test/remove_bounds_test.cpp b/test/remove_bounds_test.cpp index a8da4d1..bd35907 100644 --- a/test/remove_bounds_test.cpp +++ b/test/remove_bounds_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(remove_bounds) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST(remove_bounds_test_1, ::boost::remove_bounds, const, const) BOOST_DECL_TRANSFORM_TEST(remove_bounds_test_2, ::boost::remove_bounds, volatile, volatile) diff --git a/test/remove_const_test.cpp b/test/remove_const_test.cpp index 0186880..84a4bb0 100644 --- a/test/remove_const_test.cpp +++ b/test/remove_const_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(remove_const) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST3(remove_const_test_1, ::boost::remove_const, const) BOOST_DECL_TRANSFORM_TEST(remove_const_test_2, ::boost::remove_const, volatile, volatile) diff --git a/test/remove_cv_test.cpp b/test/remove_cv_test.cpp index 66d9b95..0f01356 100644 --- a/test/remove_cv_test.cpp +++ b/test/remove_cv_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(remove_cv) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST3(remove_cv_test_1, ::boost::remove_cv, const) BOOST_DECL_TRANSFORM_TEST3(remove_cv_test_2, ::boost::remove_cv, volatile) diff --git a/test/remove_pointer_test.cpp b/test/remove_pointer_test.cpp index 20123b3..2c1e392 100644 --- a/test/remove_pointer_test.cpp +++ b/test/remove_pointer_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(remove_pointer) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_1, ::boost::remove_pointer, const, const) BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_2, ::boost::remove_pointer, volatile, volatile) diff --git a/test/remove_reference_test.cpp b/test/remove_reference_test.cpp index a043929..ada71f6 100644 --- a/test/remove_reference_test.cpp +++ b/test/remove_reference_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(remove_reference) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST(remove_reference_test_1, ::boost::remove_reference, const, const) BOOST_DECL_TRANSFORM_TEST(remove_reference_test_2, ::boost::remove_reference, volatile, volatile) diff --git a/test/remove_volatile_test.cpp b/test/remove_volatile_test.cpp index 2b71e77..fcf238d 100644 --- a/test/remove_volatile_test.cpp +++ b/test/remove_volatile_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(remove_volatile) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST(remove_volatile_test_1, ::boost::remove_volatile, const, const) BOOST_DECL_TRANSFORM_TEST3(remove_volatile_test_2, ::boost::remove_volatile, volatile) diff --git a/test/test.hpp b/test/test.hpp index fa14bb4..4342d27 100644 --- a/test/test.hpp +++ b/test/test.hpp @@ -16,17 +16,17 @@ #define tt std -#define TYPE_TRAITS(x) -#define TYPE_COMPARE(x) -#define TYPE_TRANSFORM(x) +//#define TYPE_TRAITS(x) +//#define TYPE_COMPARE(x) +//#define TYPE_TRANSFORM(x) #else #define tt boost -#define TYPE_TRAITS(x) BOOST_STRINGIZE(boost/type_traits/x.hpp) -#define TYPE_COMPARE(x) BOOST_STRINGIZE(boost/type_traits/x.hpp) -#define TYPE_TRANSFORM(x) BOOST_STRINGIZE(boost/type_traits/x.hpp) +//#define TYPE_TRAITS(x) BOOST_STRINGIZE(boost/type_traits/x.hpp) +//#define TYPE_COMPARE(x) BOOST_STRINGIZE(boost/type_traits/x.hpp) +//#define TYPE_TRANSFORM(x) BOOST_STRINGIZE(boost/type_traits/x.hpp) #endif diff --git a/test/tricky_abstract_type_test.cpp b/test/tricky_abstract_type_test.cpp index e3bbc57..e146740 100644 --- a/test/tricky_abstract_type_test.cpp +++ b/test/tricky_abstract_type_test.cpp @@ -6,8 +6,12 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_empty) -#include TYPE_TRAITS(is_stateless) +#ifdef TEST_STD +# include +#else +# include +# include +#endif TT_TEST_BEGIN(tricky_abstract_type_test) diff --git a/test/tricky_add_pointer_test.cpp b/test/tricky_add_pointer_test.cpp index fade740..3d307bf 100644 --- a/test/tricky_add_pointer_test.cpp +++ b/test/tricky_add_pointer_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_type.hpp" -#include TYPE_TRANSFORM(add_pointer) +#ifdef TEST_STD +# include +#else +# include +#endif BOOST_DECL_TRANSFORM_TEST(add_pointer_test_5, ::boost::add_pointer, const &, const*) BOOST_DECL_TRANSFORM_TEST(add_pointer_test_6, ::boost::add_pointer, &, *) diff --git a/test/tricky_function_type_test.cpp b/test/tricky_function_type_test.cpp index 186e132..33ea4e2 100644 --- a/test/tricky_function_type_test.cpp +++ b/test/tricky_function_type_test.cpp @@ -6,18 +6,22 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_function) -#include TYPE_TRAITS(is_float) -#include TYPE_TRAITS(is_enum) -#include TYPE_TRAITS(is_class) -#include TYPE_TRAITS(is_scalar) -#include TYPE_TRAITS(is_pod) -#include TYPE_TRAITS(has_trivial_constructor) -#include TYPE_TRAITS(has_trivial_copy) -#include TYPE_TRAITS(has_trivial_assign) -#include TYPE_TRAITS(has_trivial_destructor) -#include TYPE_TRAITS(is_compound) -#include TYPE_TRAITS(is_base_and_derived) +#ifdef TEST_STD +# include +#else +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +#endif TT_TEST_BEGIN(tricky_function_type_test) diff --git a/test/tricky_incomplete_type_test.cpp b/test/tricky_incomplete_type_test.cpp index 857d9f6..f9f4e98 100644 --- a/test/tricky_incomplete_type_test.cpp +++ b/test/tricky_incomplete_type_test.cpp @@ -6,7 +6,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include +#ifdef TEST_STD +# include +#else +# include +#endif TT_TEST_BEGIN(tricky_incomplete_type_test) diff --git a/test/tricky_is_enum_test.cpp b/test/tricky_is_enum_test.cpp index 4ae3212..d7719b0 100755 --- a/test/tricky_is_enum_test.cpp +++ b/test/tricky_is_enum_test.cpp @@ -5,7 +5,11 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(is_enum) +#ifdef TEST_STD +# include +#else +# include +#endif struct convertible_to_anything { diff --git a/test/tricky_partial_spec_test.cpp b/test/tricky_partial_spec_test.cpp index d60de31..c47c0a0 100644 --- a/test/tricky_partial_spec_test.cpp +++ b/test/tricky_partial_spec_test.cpp @@ -6,14 +6,18 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(alignment_of) -#include TYPE_TRAITS(has_nothrow_assign) -#include TYPE_TRAITS(has_nothrow_constructor) -#include TYPE_TRAITS(has_nothrow_copy) -#include TYPE_TRAITS(is_base_and_derived) -#include TYPE_COMPARE(is_same) -#include TYPE_COMPARE(is_convertible) -#include TYPE_TRAITS(is_polymorphic) +#ifdef TEST_STD +# include +#else +#include +#include +#include +#include +#include +#include +#include +#include +#endif // // VC++ emits an awful lot of warnings unless we define these: diff --git a/test/type_with_alignment_test.cpp b/test/type_with_alignment_test.cpp index 37359d5..6ffafce 100644 --- a/test/type_with_alignment_test.cpp +++ b/test/type_with_alignment_test.cpp @@ -6,10 +6,13 @@ #include "test.hpp" #include "check_integral_constant.hpp" -#include TYPE_TRAITS(alignment_of) -#include TYPE_TRAITS(type_with_alignment) -#include TYPE_TRAITS(is_pod) - +#ifdef TEST_STD +# include +#else +# include +# include +# include +#endif TT_TEST_BEGIN(type_with_alignment)