Patches for MWCW and gcc-4.0.

[SVN r26704]
This commit is contained in:
John Maddock
2005-01-15 11:23:46 +00:00
parent 34355d3e79
commit 1e48609cfd
4 changed files with 22 additions and 3 deletions

View File

@ -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;
};
}

View File

@ -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;
};
}

View File

@ -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>

View File

@ -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;
}
}