From 13df83ab960ca2714b2a4a2c7d114406c288390f Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Sat, 21 Oct 2000 13:14:45 +0000
Subject: [PATCH] A partial Pro6 fix (Pro6 is missing the message facet - what
 do we do about /that/?)

[SVN r8031]
---
 include/boost/re_detail/regex_match.hpp | 27 ++++++++++++++++---------
 src/c_regex_traits.cpp                  |  1 +
 src/cpp_regex_traits.cpp                |  9 ++++++---
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/include/boost/re_detail/regex_match.hpp b/include/boost/re_detail/regex_match.hpp
index 7aae87ab..9a8cd4d8 100644
--- a/include/boost/re_detail/regex_match.hpp
+++ b/include/boost/re_detail/regex_match.hpp
@@ -1118,7 +1118,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
             else
             {
                need_init = false;
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                   {} // dwa 10/20/2000 - warning suppression for MWCW
                if(restart != last)
                   ++restart;
                _skip_and_inc(clines, last_line, first, restart);
@@ -1134,7 +1135,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
       }
       else
       {
-         for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+         for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+             {} // dwa 10/20/2000 - warning suppression for MWCW
          if(restart != last)
             ++restart;
          _skip_and_inc(clines, last_line, first, restart);
@@ -1207,7 +1209,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
                }
                else
                {
-                  for(int k = 0; (restart != first) && (k < j); ++k, --restart);
+                  for(int k = 0; (restart != first) && (k < j); ++k, --restart)
+                      {} // dwa 10/20/2000 - warning suppression for MWCW
                   if(restart != last)
                      ++restart;
                   _skip_and_inc(clines, last_line, first, restart);
@@ -1250,7 +1253,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
                   else
                   {
                      need_init = false;
-                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                         {} // dwa 10/20/2000 - warning suppression for MWCW
                      if(restart != last)
                         ++restart;
                      _skip_and_inc(clines, last_line, first, restart);
@@ -1267,7 +1271,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
             }
             else
             {
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                   {} // dwa 10/20/2000 - warning suppression for MWCW
                if(restart != last)
                   ++restart;
                _skip_and_inc(clines, last_line, first, restart);
@@ -1337,7 +1342,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
                   else
                   {
                      need_init = false;
-                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                         {} // dwa 10/20/2000 - warning suppression for MWCW
                      if(restart != last)
                         ++restart;
                      _skip_and_inc(clines, last_line, first, restart);
@@ -1353,7 +1359,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
             }
             else
             {
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                   {} // dwa 10/20/2000 - warning suppression for MWCW
                if(restart != last)
                   ++restart;
                _skip_and_inc(clines, last_line, first, restart);
@@ -1411,7 +1418,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
                   else
                   {
                      need_init = false;
-                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                         {} // dwa 10/20/2000 - warning suppression for MWCW
                      if(restart != last)
                         ++restart;
                      _skip_and_inc(clines, last_line, first, restart);
@@ -1427,7 +1435,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
             }
             else
             {
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                   {} // dwa 10/20/2000 - warning suppression for MWCW
                if(restart != last)
                   ++restart;
                _skip_and_inc(clines, last_line, first, restart);
diff --git a/src/c_regex_traits.cpp b/src/c_regex_traits.cpp
index cebf0b7a..84a3b5fa 100644
--- a/src/c_regex_traits.cpp
+++ b/src/c_regex_traits.cpp
@@ -29,6 +29,7 @@
 #include <boost/regex_traits.hpp>
 #include <boost/re_detail/regex_synch.hpp>
 #include <boost/re_detail/regex_cstring.hpp>
+#include <wchar.h> // dwa 10/20/2000 - needed for definition of wcslen()
 
 #include "primary_transform.hpp"
 
diff --git a/src/cpp_regex_traits.cpp b/src/cpp_regex_traits.cpp
index 48c08e25..a763dd66 100644
--- a/src/cpp_regex_traits.cpp
+++ b/src/cpp_regex_traits.cpp
@@ -28,17 +28,20 @@
 #include <map>
 #include <boost/cregex.hpp>
 #include "primary_transform.hpp"
+#include <locale> // dwa 10/20/2000 - needed for definition of std::messages
+#include <wchar.h> // dwa 10/20/2000 - needed for wcscpy
+
 
 #ifndef BOOST_RE_NO_LOCALE_H
 
-#ifdef BOOST_MSVC
-#pragma warning(disable:4786)
+# ifdef BOOST_MSVC
+#  pragma warning(disable:4786)
 namespace std
 { 
    using ::abs; 
    using ::mbstate_t;
 }
-#endif
+#  endif
 
 namespace{
    const unsigned int re_classes_max = 14;