From 1e48609cfd8169839a5cbbbe36eac9273977e73a Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sat, 15 Jan 2005 11:23:46 +0000
Subject: [PATCH] Patches for MWCW and gcc-4.0.

[SVN r26704]
---
 include/boost/regex/icu.hpp                 | 5 +++++
 include/boost/regex/mfc.hpp                 | 5 +++++
 include/boost/regex/v4/regex_format.hpp     | 6 ++++++
 include/boost/regex/v4/w32_regex_traits.hpp | 9 ++++++---
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/include/boost/regex/icu.hpp b/include/boost/regex/icu.hpp
index 8ece578d..2264fb53 100644
--- a/include/boost/regex/icu.hpp
+++ b/include/boost/regex/icu.hpp
@@ -858,6 +858,11 @@ public:
       *out += v; 
       return *this; 
    }
+   typedef std::ptrdiff_t difference_type;
+   typedef UChar value_type;
+   typedef value_type* pointer;
+   typedef value_type& reference;
+   typedef std::output_iterator_tag iterator_category;
 };
 
 }
diff --git a/include/boost/regex/mfc.hpp b/include/boost/regex/mfc.hpp
index c621b695..612d9e78 100644
--- a/include/boost/regex/mfc.hpp
+++ b/include/boost/regex/mfc.hpp
@@ -164,6 +164,11 @@ public:
       out->AppendChar(v); 
       return *this; 
    }
+   typedef std::ptrdiff_t difference_type;
+   typedef B value_type;
+   typedef value_type* pointer;
+   typedef value_type& reference;
+   typedef std::output_iterator_tag iterator_category;
 };
 
 }
diff --git a/include/boost/regex/v4/regex_format.hpp b/include/boost/regex/v4/regex_format.hpp
index 0f4d4a5c..d6f1ed82 100644
--- a/include/boost/regex/v4/regex_format.hpp
+++ b/include/boost/regex/v4/regex_format.hpp
@@ -536,6 +536,12 @@ public:
       out->append(1, v); 
       return *this; 
    }
+
+   typedef std::ptrdiff_t difference_type;
+   typedef typename S::value_type value_type;
+   typedef value_type* pointer;
+   typedef value_type& reference;
+   typedef std::output_iterator_tag iterator_category;
 };
 
 template <class OutputIterator, class Iterator, class Alloc, class charT, class traits>
diff --git a/include/boost/regex/v4/w32_regex_traits.hpp b/include/boost/regex/v4/w32_regex_traits.hpp
index c9c42dea..16614f98 100644
--- a/include/boost/regex/v4/w32_regex_traits.hpp
+++ b/include/boost/regex/v4/w32_regex_traits.hpp
@@ -19,6 +19,9 @@
 #ifndef BOOST_W32_REGEX_TRAITS_HPP_INCLUDED
 #define BOOST_W32_REGEX_TRAITS_HPP_INCLUDED
 
+#ifndef BOOST_RE_PAT_EXCEPT_HPP
+#include <boost/regex/pattern_except.hpp>
+#endif
 #ifndef BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
 #include <boost/regex/v4/regex_traits_defaults.hpp>
 #endif
@@ -199,10 +202,10 @@ w32_regex_traits_char_layer<charT>::w32_regex_traits_char_layer(::boost::re_deta
    {
       for(regex_constants::syntax_type i = 1; i < regex_constants::syntax_max; ++i)
       {
-         string_type mss = ::boost::re_detail::w32_cat_get(cat, m_locale, i, get_default_message(i));
+         string_type mss = ::boost::re_detail::w32_cat_get(cat, this->m_locale, i, get_default_message(i));
          for(typename string_type::size_type j = 0; j < mss.size(); ++j)
          {
-            m_char_map[mss[j]] = i;
+            this->m_char_map[mss[j]] = i;
          }
       }
    }
@@ -213,7 +216,7 @@ w32_regex_traits_char_layer<charT>::w32_regex_traits_char_layer(::boost::re_deta
          const char* ptr = get_default_syntax(i);
          while(ptr && *ptr)
          {
-            m_char_map[static_cast<charT>(*ptr)] = i;
+            this->m_char_map[static_cast<charT>(*ptr)] = i;
             ++ptr;
          }
       }