mirror of
https://github.com/boostorg/regex.git
synced 2025-07-14 21:06:38 +02:00
Misc regex fixes: removed BOOST_RE_NO_EXCEPTION_H macro (no longer needed), added hack for VC6+STLPort regression test (missing wstring exports in STLPort dll).
[SVN r9555]
This commit is contained in:
@ -613,7 +613,6 @@ void run_tests()
|
||||
re_type e(expression.c_str(), f);
|
||||
cpp_tests(e, true);
|
||||
}
|
||||
#ifndef BOOST_RE_NO_EXCEPTION_H
|
||||
catch(const std::exception& e)
|
||||
{
|
||||
//
|
||||
@ -624,7 +623,6 @@ void run_tests()
|
||||
cout << "Unexpected exception thrown from C++ library: " << e.what() << endl;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
catch(...)
|
||||
{
|
||||
begin_error();
|
||||
|
@ -26,6 +26,18 @@
|
||||
// disable automatic selection of support library:
|
||||
#define BOOST_RE_NO_LIB
|
||||
|
||||
#if defined(_MSC_VER) && defined(__STL_DEBUG) && defined(_DLL)
|
||||
//
|
||||
// Ugly hack:
|
||||
// when this file is built with VC6 + STLPort 4 we get unresolved externals
|
||||
// from std::wstring if __STL_DEBUG is defined. As a workaround disable
|
||||
// STL debugging support in this case. This weakens the regression tests
|
||||
// but is still better than not being able to run them at all. This should be
|
||||
// removed once STLPort gets fixed.
|
||||
//
|
||||
#undef __STL_DEBUG
|
||||
#endif
|
||||
|
||||
#include <boost/regex.hpp>
|
||||
|
||||
#ifdef BOOST_RE_NO_WCSTRING
|
||||
@ -163,7 +175,6 @@ template test_string_type regex_merge(const test_string_type&,
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
} // namespace boost
|
||||
|
||||
//
|
||||
|
Reference in New Issue
Block a user