From 7f7cde4378c09d91cbbbe25a5c98bb00325a26b4 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Thu, 20 Feb 2014 11:32:01 +0000 Subject: [PATCH] Remove obsolete #includes - reduces dependency burden. --- test/check_integral_constant.hpp | 4 ---- test/check_type.hpp | 4 ---- test/test.hpp | 35 +------------------------------- 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/test/check_integral_constant.hpp b/test/check_integral_constant.hpp index 754a170..a21b6c5 100644 --- a/test/check_integral_constant.hpp +++ b/test/check_integral_constant.hpp @@ -7,11 +7,7 @@ #ifndef BOOST_CHECK_INTEGRAL_CONSTANT_HPP #define BOOST_CHECK_INTEGRAL_CONSTANT_HPP -#ifdef USE_UNIT_TEST -#include -#else #include "test.hpp" -#endif namespace boost{ namespace detail{ diff --git a/test/check_type.hpp b/test/check_type.hpp index 33ed399..7bd0779 100644 --- a/test/check_type.hpp +++ b/test/check_type.hpp @@ -7,11 +7,7 @@ #ifndef BOOST_CHECK_TYPE_HPP #define BOOST_CHECK_TYPE_HPP -#ifdef USE_UNIT_TEST -#include -#else #include "test.hpp" -#endif #include /* diff --git a/test/test.hpp b/test/test.hpp index 4b826df..1f2211e 100644 --- a/test/test.hpp +++ b/test/test.hpp @@ -13,10 +13,7 @@ #pragma warning(disable:4201) #endif -#ifdef USE_UNIT_TEST -# include -#endif -#include +#include #include #include @@ -62,35 +59,6 @@ #endif -#ifdef USE_UNIT_TEST -// -// global unit, this is not safe, but until the unit test framework uses -// shared_ptr throughout this is about as good as it gets :-( -// -boost::unit_test::test_suite* get_master_unit(const char* name = 0); - -// -// initialisation class: -// -class unit_initialiser -{ -public: - unit_initialiser(void (*f)(), const char* /*name*/) - { - get_master_unit("Type Traits")->add( BOOST_TEST_CASE(f) ); - } -}; - -#define TT_TEST_BEGIN(trait_name)\ - namespace{\ - void trait_name();\ - unit_initialiser init(trait_name, BOOST_STRINGIZE(trait_name));\ - void trait_name(){ - -#define TT_TEST_END }} - -#else - // // replacements for Unit test macros: // @@ -128,7 +96,6 @@ int error_count = 0; int main(){ #define TT_TEST_END return error_count; } -#endif #define TRANSFORM_CHECK(name, from_suffix, to_suffix)\ BOOST_CHECK_TYPE(bool to_suffix, name::type);\