From db5748ae7e33e81c4937104283d70aa95f079390 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sat, 27 Aug 2005 10:25:15 +0000
Subject: [PATCH] Added config and header include changes needed to support
 MSVC + STLport 5.0.

[SVN r30701]
---
 doc/Attic/history.html                      | 14 ++++++++++----
 doc/history.html                            | 14 ++++++++++----
 include/boost/regex/v4/regex_match.hpp      |  8 ++++++++
 include/boost/regex/v4/regex_workaround.hpp |  1 +
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/doc/Attic/history.html b/doc/Attic/history.html
index 15ff41aa..bc9db007 100644
--- a/doc/Attic/history.html
+++ b/doc/Attic/history.html
@@ -24,7 +24,7 @@
       </P>
       <HR>
       <p></p>
-      <P>Boost 1.33.0 Hotfix</P>
+      <P>Boost 1.33.1</P>
       <UL>
          <LI>
          Fixed broken makefiles.
@@ -47,8 +47,14 @@
          Changed the deffinition of regex_error to make it backwards compatible with 
          Boost-1.32.0.
          <LI>
-            Disabled external templates for Intel C++ 8.0 and earlier - otherwise 
-            unresolved references can occur.</LI></UL>
+         Disabled external templates for Intel C++ 8.0 and earlier - otherwise 
+         unresolved references can occur.
+         <LI>
+         Initialise all the data members of the unicode_iterators: this keeps gcc from 
+         issuing needless warnings.
+         <LI>
+            Added needed header include to regex_workaround.hpp: appears to be an 
+            MSVC+STLport 5 specific problem.</LI></UL>
       <P>Boost 1.33.0.</P>
       <UL>
          <LI>
@@ -130,7 +136,7 @@
          <HR>
       <P></P>
       <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
+         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
          28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
diff --git a/doc/history.html b/doc/history.html
index 15ff41aa..bc9db007 100644
--- a/doc/history.html
+++ b/doc/history.html
@@ -24,7 +24,7 @@
       </P>
       <HR>
       <p></p>
-      <P>Boost 1.33.0 Hotfix</P>
+      <P>Boost 1.33.1</P>
       <UL>
          <LI>
          Fixed broken makefiles.
@@ -47,8 +47,14 @@
          Changed the deffinition of regex_error to make it backwards compatible with 
          Boost-1.32.0.
          <LI>
-            Disabled external templates for Intel C++ 8.0 and earlier - otherwise 
-            unresolved references can occur.</LI></UL>
+         Disabled external templates for Intel C++ 8.0 and earlier - otherwise 
+         unresolved references can occur.
+         <LI>
+         Initialise all the data members of the unicode_iterators: this keeps gcc from 
+         issuing needless warnings.
+         <LI>
+            Added needed header include to regex_workaround.hpp: appears to be an 
+            MSVC+STLport 5 specific problem.</LI></UL>
       <P>Boost 1.33.0.</P>
       <UL>
          <LI>
@@ -130,7 +136,7 @@
          <HR>
       <P></P>
       <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
+         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
          28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
diff --git a/include/boost/regex/v4/regex_match.hpp b/include/boost/regex/v4/regex_match.hpp
index db3d9aa3..b12de6fe 100644
--- a/include/boost/regex/v4/regex_match.hpp
+++ b/include/boost/regex/v4/regex_match.hpp
@@ -107,6 +107,7 @@ inline bool regex_match(const char* str,
    match_results<const char*> m;
    return regex_match(str, str + regex::traits_type::length(str), m, e, flags | regex_constants::match_any);
 }
+#ifndef BOOST_NO_STD_LOCALE
 inline bool regex_match(const char* str, 
                         cmatch& m, 
                         const basic_regex<char, cpp_regex_traits<char> >& e, 
@@ -121,6 +122,7 @@ inline bool regex_match(const char* str,
    match_results<const char*> m;
    return regex_match(str, str + regex::traits_type::length(str), m, e, flags | regex_constants::match_any);
 }
+#endif
 inline bool regex_match(const char* str, 
                         cmatch& m, 
                         const basic_regex<char, c_regex_traits<char> >& e, 
@@ -166,6 +168,7 @@ inline bool regex_match(const wchar_t* str,
    match_results<const wchar_t*> m;
    return regex_match(str, str + wregex::traits_type::length(str), m, e, flags | regex_constants::match_any);
 }
+#ifndef BOOST_NO_STD_LOCALE
 inline bool regex_match(const wchar_t* str, 
                         wcmatch& m, 
                         const basic_regex<wchar_t, cpp_regex_traits<wchar_t> >& e, 
@@ -180,6 +183,7 @@ inline bool regex_match(const wchar_t* str,
    match_results<const wchar_t*> m;
    return regex_match(str, str + wregex::traits_type::length(str), m, e, flags | regex_constants::match_any);
 }
+#endif
 inline bool regex_match(const wchar_t* str, 
                         wcmatch& m, 
                         const basic_regex<wchar_t, c_regex_traits<wchar_t> >& e, 
@@ -225,6 +229,7 @@ inline bool regex_match(const std::string& s,
    match_results<std::string::const_iterator> m;
    return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
 }
+#ifndef BOOST_NO_STD_LOCALE
 inline bool regex_match(const std::string& s, 
                         smatch& m,
                         const basic_regex<char, cpp_regex_traits<char> >& e, 
@@ -239,6 +244,7 @@ inline bool regex_match(const std::string& s,
    match_results<std::string::const_iterator> m;
    return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
 }
+#endif
 inline bool regex_match(const std::string& s, 
                         smatch& m,
                         const basic_regex<char, c_regex_traits<char> >& e, 
@@ -284,6 +290,7 @@ inline bool regex_match(const std::basic_string<wchar_t>& s,
    match_results<std::basic_string<wchar_t>::const_iterator> m;
    return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
 }
+#ifndef BOOST_NO_STD_LOCALE
 inline bool regex_match(const std::basic_string<wchar_t>& s, 
                         match_results<std::basic_string<wchar_t>::const_iterator>& m,
                         const basic_regex<wchar_t, cpp_regex_traits<wchar_t> >& e, 
@@ -298,6 +305,7 @@ inline bool regex_match(const std::basic_string<wchar_t>& s,
    match_results<std::basic_string<wchar_t>::const_iterator> m;
    return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
 }
+#endif
 inline bool regex_match(const std::basic_string<wchar_t>& s, 
                         match_results<std::basic_string<wchar_t>::const_iterator>& m,
                         const basic_regex<wchar_t, c_regex_traits<wchar_t> >& e, 
diff --git a/include/boost/regex/v4/regex_workaround.hpp b/include/boost/regex/v4/regex_workaround.hpp
index 090bcd2e..695e8f65 100644
--- a/include/boost/regex/v4/regex_workaround.hpp
+++ b/include/boost/regex/v4/regex_workaround.hpp
@@ -25,6 +25,7 @@
 #include <cstdlib>
 #include <cstddef>
 #include <cassert>
+#include <cstdio>
 #include <string>
 #include <stdexcept>
 #include <iterator>