Initial commit of v4 of boost.regex on regex-4 branch

[SVN r18128]

include/boost/regex/v3/cregex.hpp

@@ -182,6 +182,7 @@ enum match_flags
    match_max = match_all
 };
 
+typedef unsigned long match_flag_type;
 
 #ifdef __cplusplus
 } // extern "C"
@@ -254,29 +255,29 @@ public:
    //
    // now matching operators:
    //
-   bool Match(const char* p, unsigned int flags = match_default);
-   bool Match(const std::string& s, unsigned int flags = match_default) { return Match(s.c_str(), flags); }
-   bool Search(const char* p, unsigned int flags = match_default);
-   bool Search(const std::string& s, unsigned int flags = match_default) { return Search(s.c_str(), flags); }
-   unsigned int Grep(GrepCallback cb, const char* p, unsigned int flags = match_default);
-   unsigned int Grep(GrepCallback cb, const std::string& s, unsigned int flags = match_default) { return Grep(cb, s.c_str(), flags); }
-   unsigned int Grep(std::vector<std::string>& v, const char* p, unsigned int flags = match_default);
-   unsigned int Grep(std::vector<std::string>& v, const std::string& s, unsigned int flags = match_default) { return Grep(v, s.c_str(), flags); }
-   unsigned int Grep(std::vector<std::size_t>& v, const char* p, unsigned int flags = match_default);
-   unsigned int Grep(std::vector<std::size_t>& v, const std::string& s, unsigned int flags = match_default) { return Grep(v, s.c_str(), flags); }
+   bool Match(const char* p, match_flag_type flags = match_default);
+   bool Match(const std::string& s, match_flag_type flags = match_default) { return Match(s.c_str(), flags); }
+   bool Search(const char* p, match_flag_type flags = match_default);
+   bool Search(const std::string& s, match_flag_type flags = match_default) { return Search(s.c_str(), flags); }
+   unsigned int Grep(GrepCallback cb, const char* p, match_flag_type flags = match_default);
+   unsigned int Grep(GrepCallback cb, const std::string& s, match_flag_type flags = match_default) { return Grep(cb, s.c_str(), flags); }
+   unsigned int Grep(std::vector<std::string>& v, const char* p, match_flag_type flags = match_default);
+   unsigned int Grep(std::vector<std::string>& v, const std::string& s, match_flag_type flags = match_default) { return Grep(v, s.c_str(), flags); }
+   unsigned int Grep(std::vector<std::size_t>& v, const char* p, match_flag_type flags = match_default);
+   unsigned int Grep(std::vector<std::size_t>& v, const std::string& s, match_flag_type flags = match_default) { return Grep(v, s.c_str(), flags); }
 #ifndef BOOST_REGEX_NO_FILEITER
-   unsigned int GrepFiles(GrepFileCallback cb, const char* files, bool recurse = false, unsigned int flags = match_default);
-   unsigned int GrepFiles(GrepFileCallback cb, const std::string& files, bool recurse = false, unsigned int flags = match_default) { return GrepFiles(cb, files.c_str(), recurse, flags); }
-   unsigned int FindFiles(FindFilesCallback cb, const char* files, bool recurse = false, unsigned int flags = match_default);
-   unsigned int FindFiles(FindFilesCallback cb, const std::string& files, bool recurse = false, unsigned int flags = match_default) { return FindFiles(cb, files.c_str(), recurse, flags); }
+   unsigned int GrepFiles(GrepFileCallback cb, const char* files, bool recurse = false, match_flag_type flags = match_default);
+   unsigned int GrepFiles(GrepFileCallback cb, const std::string& files, bool recurse = false, match_flag_type flags = match_default) { return GrepFiles(cb, files.c_str(), recurse, flags); }
+   unsigned int FindFiles(FindFilesCallback cb, const char* files, bool recurse = false, match_flag_type flags = match_default);
+   unsigned int FindFiles(FindFilesCallback cb, const std::string& files, bool recurse = false, match_flag_type flags = match_default) { return FindFiles(cb, files.c_str(), recurse, flags); }
 #endif
 
    std::string Merge(const std::string& in, const std::string& fmt,
-                       bool copy = true, unsigned int flags = match_default);
+                       bool copy = true, match_flag_type flags = match_default);
    std::string Merge(const char* in, const char* fmt,
-                       bool copy = true, unsigned int flags = match_default);
+                       bool copy = true, match_flag_type flags = match_default);
 
-   std::size_t Split(std::vector<std::string>& v, std::string& s, unsigned flags = match_default, unsigned max_count = ~0);
+   std::size_t Split(std::vector<std::string>& v, std::string& s, match_flag_type flags = match_default, unsigned max_count = ~0);
    //
    // now operators for returning what matched in more detail:
    //

include/boost/regex/v3/regex_match.hpp

@@ -215,11 +215,7 @@ public:
    }
    void estimate_max_state_count(iterator a, iterator b, std::size_t states, std::random_access_iterator_tag*)
    {
-#ifndef BOOST_NO_STD_DISTANCE
-      difference_type dist = std::distance(a,b);
-#else
-      difference_type dist = b - a;
-#endif
+      difference_type dist = boost::re_detail::distance(a,b);
       states *= states;
       difference_type lim = std::numeric_limits<difference_type>::max() - 1000 - states;
       if(dist > (difference_type)(lim / states))

include/boost/regex/v3/regex_traits.hpp

@@ -626,6 +626,8 @@ public:
    cpp_regex_traits();
    ~cpp_regex_traits();
 
+   void swap(cpp_regex_traits&);
+
    static std::size_t BOOST_REGEX_CALL length(const char_type* p)
    {
       return std::strlen(p);
@@ -764,6 +766,7 @@ public:
    locale_type BOOST_REGEX_CALL imbue(locale_type l);
    locale_type BOOST_REGEX_CALL getloc()const{ return locale_inst; }
    std::size_t BOOST_REGEX_CALL strwiden(wchar_t *s1, std::size_t len, const char *s2)const;
+   void swap(cpp_regex_traits&);
 
    struct sentry
    {