mirror of
https://github.com/boostorg/regex.git
synced 2025-07-18 06:42:08 +02:00
mingw dll specific fixes.
Disable one SGI test - compiler deduces template arguments strangely. [SVN r25270]
This commit is contained in:
@ -588,6 +588,7 @@ std::string RegEx::What(int i)const
|
||||
return result;
|
||||
}
|
||||
|
||||
#ifndef __MINGW32__
|
||||
#ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
|
||||
const std::size_t RegEx::npos = ::boost::integer_traits<std::size_t>::const_max;
|
||||
#elif defined(BOOST_HAS_LONG_LONG)
|
||||
@ -595,6 +596,7 @@ const std::size_t RegEx::npos = ~0ULL;
|
||||
#else
|
||||
const std::size_t RegEx::npos = ~0UL;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
} // namespace boost
|
||||
|
||||
|
@ -48,6 +48,8 @@ template test-dll
|
||||
: <template>../build/regex-dll-options
|
||||
<dll>../build/boost_regex # sources
|
||||
: <threading>multi
|
||||
<mingw><*><linkflags>"-Wl,--allow-multiple-definition"
|
||||
<mingw-3.4.1><*><linkflags>"-Wl,--allow-multiple-definition"
|
||||
;
|
||||
|
||||
#
|
||||
|
@ -35,7 +35,10 @@ void test_captures(const std::string& regx, const std::string& text, T& expected
|
||||
if(boost::regex_match(text, what, e, boost::match_extra))
|
||||
{
|
||||
unsigned i, j;
|
||||
#ifndef __sgi
|
||||
// strange type deduction causes this test to fail on SGI:
|
||||
BOOST_TEST(what.size() == ARRAY_SIZE(expected));
|
||||
#endif
|
||||
for(i = 0; i < what.size(); ++i)
|
||||
{
|
||||
BOOST_TEST(what.captures(i).size() <= ARRAY_SIZE(expected[i]));
|
||||
|
Reference in New Issue
Block a user