diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:05:34 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:06:28 +0900 |
commit | 34bd32e225e2a8a94104489b31c42e5801cc1f4a (patch) | |
tree | d021b579a0c190354819974e1eaf0baa54b551f3 /boost/test/tree/test_case_template.hpp | |
parent | f763a99a501650eff2c60288aa6f10ef916d769e (diff) | |
download | boost-34bd32e225e2a8a94104489b31c42e5801cc1f4a.tar.gz boost-34bd32e225e2a8a94104489b31c42e5801cc1f4a.tar.bz2 boost-34bd32e225e2a8a94104489b31c42e5801cc1f4a.zip |
Imported Upstream version 1.63.0upstream/1.63.0
Change-Id: Iac85556a04b7e58d63ba636dedb0986e3555714a
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
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 |