From 3c07ee04ded0dcddc6b78363932dba0bf7a7747c Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 5 Jan 2007 13:25:04 +0000 Subject: [PATCH] Disable typeid useage with VC6. [SVN r36592] --- test/regress/test.hpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/regress/test.hpp b/test/regress/test.hpp index 59660f5e..046b2d56 100644 --- a/test/regress/test.hpp +++ b/test/regress/test.hpp @@ -77,13 +77,23 @@ void do_test(const charT& c, const tagT& tag) test(e1, tag); #endif #if !BOOST_WORKAROUND(__BORLANDC__, < 0x560) +#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) && defined(TEST_THREADS) + // typeid appears to fail in multithreaded environments: + test_info::set_typename(""); +#else test_info::set_typename(typeid(boost::basic_regex >).name()); +#endif boost::basic_regex > e2; if(test_locale::c_locale_state() != test_locale::no_test) test(e2, tag); #endif #if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32) +#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) && defined(TEST_THREADS) + // typeid appears to fail in multithreaded environments: + test_info::set_typename(""); +#else test_info::set_typename(typeid(boost::basic_regex >).name()); +#endif boost::basic_regex > e3; if(test_locale::win_locale_state() == test_locale::test_with_locale) e3.imbue(test_locale::win_locale());