Merged regex-4 branch.

[SVN r18430]

example/snippets/credit_card_example.cpp

@@ -35,12 +35,12 @@ const std::string human_format("\\1-\\2-\\3-\\4");
 
 std::string machine_readable_card_number(const std::string& s)
 {
-   return boost::regex_merge(s, e, machine_format, boost::match_default | boost::format_sed);
+   return boost::regex_replace(s, e, machine_format, boost::match_default | boost::format_sed);
 }
 
 std::string human_readable_card_number(const std::string& s)
 {
-   return boost::regex_merge(s, e, human_format, boost::match_default | boost::format_sed);
+   return boost::regex_replace(s, e, human_format, boost::match_default | boost::format_sed);
 }
 
 #include <iostream>

example/snippets/regex_grep_example_1.cpp

@@ -29,7 +29,7 @@
 // and searches for all the C++ class definitions, storing
 // their locations in a map of strings/int's
 
-typedef std::map<std::string, int, std::less<std::string> > map_type;
+typedef std::map<std::string, std::string::difference_type, std::less<std::string> > map_type;
 
 const char* re = 
    // possibly leading whitespace:   
@@ -61,7 +61,7 @@ class IndexClassesPred
    std::string::const_iterator base;
 public:
    IndexClassesPred(map_type& a, std::string::const_iterator b) : m(a), base(b) {}
-   bool operator()(const boost::match_results<std::string::const_iterator, boost::regex::allocator_type>& what)
+   bool operator()(const boost::match_results<std::string::const_iterator>& what)
    {
       // what[0] contains the whole string
       // what[5] contains the class name.

example/snippets/regex_grep_example_2.cpp

@@ -30,7 +30,7 @@
 // and searches for all the C++ class definitions, storing
 // their locations in a map of strings/int's
 
-typedef std::map<std::string, int, std::less<std::string> > map_type;
+typedef std::map<std::string, std::string::difference_type, std::less<std::string> > map_type;
 
 const char* re = 
    // possibly leading whitespace:   
@@ -59,7 +59,7 @@ boost::regex expression(re);
 map_type class_index;
 std::string::const_iterator base;
 
-bool grep_callback(const boost::match_results<std::string::const_iterator, boost::regex::allocator_type>& what)
+bool grep_callback(const boost::match_results<std::string::const_iterator>& what)
 {
    // what[0] contains the whole string
    // what[5] contains the class name.

example/snippets/regex_grep_example_3.cpp

@@ -31,7 +31,7 @@
 // and searches for all the C++ class definitions, storing
 // their locations in a map of strings/int's
 
-typedef std::map<std::string, int, std::less<std::string> > map_type;
+typedef std::map<std::string, std::string::difference_type, std::less<std::string> > map_type;
 
 const char* re = 
    // possibly leading whitespace:   
@@ -62,7 +62,7 @@ class class_index
    map_type index;
    std::string::const_iterator base;
 
-   bool grep_callback(boost::match_results<std::string::const_iterator, boost::regex::allocator_type> what);
+   bool grep_callback(boost::match_results<std::string::const_iterator> what);
 public:
    map_type& get_map() { return index; }
    void IndexClasses(const std::string& file);
@@ -72,7 +72,7 @@ public:
         {}
 };
 
-bool class_index::grep_callback(boost::match_results<std::string::const_iterator, boost::regex::allocator_type> what)
+bool class_index::grep_callback(boost::match_results<std::string::const_iterator> what)
 {
    // what[0] contains the whole string
    // what[5] contains the class name.

example/snippets/regex_grep_example_4.cpp

@@ -63,9 +63,9 @@ class class_index
    boost::regex expression;
    map_type index;
    std::string::const_iterator base;
-   typedef boost::match_results<std::string::const_iterator, boost::regex::allocator_type> arg_type;
+   typedef boost::match_results<std::string::const_iterator> arg_type;
 
-   bool grep_callback(const boost::match_results<std::string::const_iterator, boost::regex::allocator_type>& what);
+   bool grep_callback(const boost::match_results<std::string::const_iterator>& what);
 public:
    map_type& get_map() { return index; }
    typedef bool (__closure* grep_callback_type)(const arg_type&);
@@ -76,7 +76,7 @@ public:
         {}
 };
 
-bool class_index::grep_callback(const boost::match_results<std::string::const_iterator, boost::regex::allocator_type>& what)
+bool class_index::grep_callback(const boost::match_results<std::string::const_iterator>& what)
 {
    // what[0] contains the whole string
    // what[5] contains the class name.

example/snippets/regex_merge_example.cpp

@@ -73,12 +73,12 @@ int main(int argc, const char** argv)
       // temporary string stream
       std::ostringstream t(std::ios::out | std::ios::binary);
       std::ostream_iterator<char> oi(t);
-      boost::regex_merge(oi, in.begin(), in.end(), e2, pre_format);
+      boost::regex_merge(oi, in.begin(), in.end(), e2, pre_format, boost::match_default | boost::format_all);
       // then output to final output stream
       // adding syntax highlighting:
       std::string s(t.str());
       std::ostream_iterator<char> out(os);
-      boost::regex_merge(out, s.begin(), s.end(), e1, format_string);
+      boost::regex_merge(out, s.begin(), s.end(), e1, format_string, boost::match_default | boost::format_all);
       os << footer_text;
    }
    }

example/snippets/regex_search_example.cpp

@@ -29,7 +29,7 @@
 // and searches for all the C++ class definitions, storing
 // their locations in a map of strings/int's
 
-typedef std::map<std::string, int, std::less<std::string> > map_type;
+typedef std::map<std::string, std::string::difference_type, std::less<std::string> > map_type;
 
 const char* re = 
    // possibly leading whitespace:   
@@ -62,7 +62,7 @@ void IndexClasses(map_type& m, const std::string& file)
    start = file.begin();
    end = file.end();   
    boost::match_results<std::string::const_iterator> what;
-   unsigned int flags = boost::match_default;
+   boost::match_flag_type flags = boost::match_default;
    while(boost::regex_search(start, end, what, expression, flags))   
    {
       // what[0] contains the whole string

example/snippets/regex_split_example_2.cpp

@@ -28,7 +28,7 @@
 #include <boost/regex.hpp>
 
 boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*)\"",
-               boost::regbase::normal | boost::regbase::icase);
+               boost::regex::normal | boost::regbase::icase);
 
 void load_file(std::string& s, std::istream& is)
 {