Petr Machata 255051
diff -up ./boost/regex/icu.hpp~ ./boost/regex/icu.hpp
Petr Machata 255051
--- ./boost/regex/icu.hpp~	2011-10-16 14:19:37.000000000 +0200
Petr Machata 255051
+++ ./boost/regex/icu.hpp	2013-07-22 23:32:44.346321967 +0200
Petr Machata 255051
@@ -423,7 +423,6 @@ bool do_regex_match(BidiIterator first, 
Petr Machata 255051
 {
Petr Machata 255051
    typedef u16_to_u32_iterator<BidiIterator, UChar32> conv_type;
Petr Machata 255051
    typedef match_results<conv_type>                   match_type;
Petr Machata 255051
-   typedef typename match_type::allocator_type        alloc_type;
Petr Machata 255051
    match_type what;
Petr Machata 255051
    bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags);
Petr Machata 255051
    // copy results across to m:
Petr Machata 255051
@@ -439,7 +438,6 @@ bool do_regex_match(BidiIterator first, 
Petr Machata 255051
 {
Petr Machata 255051
    typedef u8_to_u32_iterator<BidiIterator, UChar32>  conv_type;
Petr Machata 255051
    typedef match_results<conv_type>                   match_type;
Petr Machata 255051
-   typedef typename match_type::allocator_type        alloc_type;
Petr Machata 255051
    match_type what;
Petr Machata 255051
    bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags);
Petr Machata 255051
    // copy results across to m:
Petr Machata 255051
@@ -598,7 +596,6 @@ bool do_regex_search(BidiIterator first,
Petr Machata 255051
 {
Petr Machata 255051
    typedef u16_to_u32_iterator<BidiIterator, UChar32> conv_type;
Petr Machata 255051
    typedef match_results<conv_type>                   match_type;
Petr Machata 255051
-   typedef typename match_type::allocator_type        alloc_type;
Petr Machata 255051
    match_type what;
Petr Machata 255051
    bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base));
Petr Machata 255051
    // copy results across to m:
Petr Machata 255051
@@ -615,7 +612,6 @@ bool do_regex_search(BidiIterator first,
Petr Machata 255051
 {
Petr Machata 255051
    typedef u8_to_u32_iterator<BidiIterator, UChar32>  conv_type;
Petr Machata 255051
    typedef match_results<conv_type>                   match_type;
Petr Machata 255051
-   typedef typename match_type::allocator_type        alloc_type;
Petr Machata 255051
    match_type what;
Petr Machata 255051
    bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base));
Petr Machata 255051
    // copy results across to m:
Petr Machata 255051
diff -up ./boost/regex/v4/regex_format.hpp~ ./boost/regex/v4/regex_format.hpp
Petr Machata 255051
--- ./boost/regex/v4/regex_format.hpp~	2012-05-24 12:03:48.000000000 +0200
Petr Machata 255051
+++ ./boost/regex/v4/regex_format.hpp	2013-07-22 23:31:06.466740621 +0200
Petr Machata 255051
@@ -1064,7 +1064,6 @@ struct format_functor_c_string
Petr Machata 255051
    template <class OutputIter>
Petr Machata 255051
    OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits())
Petr Machata 255051
    {
Petr Machata 255051
-      typedef typename Match::char_type char_type;
Petr Machata 255051
       const charT* end = func;
Petr Machata 255051
       while(*end) ++end;
Petr Machata 255051
       return regex_format_imp(i, m, func, end, f, t);
Petr Machata 255051
@@ -1083,7 +1082,6 @@ struct format_functor_container
Petr Machata 255051
    template <class OutputIter>
Petr Machata 255051
    OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits())
Petr Machata 255051
    {
Petr Machata 255051
-      typedef typename Match::char_type char_type;
Petr Machata 255051
       return re_detail::regex_format_imp(i, m, func.begin(), func.end(), f, t);
Petr Machata 255051
    }
Petr Machata 255051
 private:
Petr Machata 255051
diff -up ./boost/regex/v4/regex_split.hpp~ ./boost/regex/v4/regex_split.hpp
Petr Machata 255051
--- ./boost/regex/v4/regex_split.hpp~	2007-11-25 19:07:19.000000000 +0100
Petr Machata 255051
+++ ./boost/regex/v4/regex_split.hpp	2013-07-22 23:31:29.098875039 +0200
Petr Machata 255051
@@ -107,7 +107,6 @@ std::size_t regex_split(OutputIterator o
Petr Machata 255051
                    std::size_t max_split)
Petr Machata 255051
 {
Petr Machata 255051
    typedef typename std::basic_string<charT, Traits1, Alloc1>::const_iterator  ci_t;
Petr Machata 255051
-   typedef typename match_results<ci_t>::allocator_type                        match_allocator;
Petr Machata 255051
    ci_t last = s.begin();
Petr Machata 255051
    std::size_t init_size = max_split;
Petr Machata 255051
    re_detail::split_pred<OutputIterator, charT, Traits1, Alloc1> pred(&last, &out, &max_split);