diff options
Diffstat (limited to 'boost/test/tree/test_case_template.hpp')
-rw-r--r-- | boost/test/tree/test_case_template.hpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/boost/test/tree/test_case_template.hpp b/boost/test/tree/test_case_template.hpp index 56871b7b6b..6a1fc3e57b 100644 --- a/boost/test/tree/test_case_template.hpp +++ b/boost/test/tree/test_case_template.hpp @@ -5,11 +5,8 @@ // See http://www.boost.org/libs/test for the library home page. // -// File : $RCSfile$ -// -// Version : $Revision: -1 $ -// -// Description : defines template_test_case_gen +///@ file +/// Defines template_test_case_gen // *************************************************************************** #ifndef BOOST_TEST_TREE_TEST_CASE_TEMPLATE_HPP_091911GER @@ -34,10 +31,10 @@ #include <boost/type_traits/is_const.hpp> #include <boost/function/function0.hpp> -#ifndef BOOST_NO_RTTI -#include <typeinfo> // for typeid +#if defined(BOOST_NO_TYPEID) || defined(BOOST_NO_RTTI) +# include <boost/current_function.hpp> #else -#include <boost/current_function.hpp> +# include <boost/core/demangle.hpp> #endif // STL @@ -82,8 +79,8 @@ struct generate_test_case_4_type { std::string full_name; assign_op( full_name, m_test_case_name, 0 ); full_name += '<'; -#ifndef BOOST_NO_RTTI - full_name += typeid(TestType).name(); +#if !defined(BOOST_NO_TYPEID) && !defined(BOOST_NO_RTTI) + full_name += boost::core::demangle(typeid(TestType).name()); // same as execution_monitor.ipp #else full_name += BOOST_CURRENT_FUNCTION; #endif |