From c0e6b1f5a21b55ae386f8076335302691544ca0e Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Mon, 20 Sep 2004 12:31:08 +0000
Subject: [PATCH] mingw dll specific fixes. Disable one SGI test - compiler
 deduces template arguments strangely.

[SVN r25270]
---
 src/cregex.cpp                  | 2 ++
 test/Jamfile                    | 2 ++
 test/captures/captures_test.cpp | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/src/cregex.cpp b/src/cregex.cpp
index 02191851..ef259946 100644
--- a/src/cregex.cpp
+++ b/src/cregex.cpp
@@ -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
 
diff --git a/test/Jamfile b/test/Jamfile
index ab22fd7c..2e29a806 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -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"
    ;
  
 #
diff --git a/test/captures/captures_test.cpp b/test/captures/captures_test.cpp
index 8f389e40..83f23c5a 100644
--- a/test/captures/captures_test.cpp
+++ b/test/captures/captures_test.cpp
@@ -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]));