From 2cbd1c888227807651d9e330ea8a43c524c8c9cb Mon Sep 17 00:00:00 2001 From: John Maddock Date: Mon, 14 Jan 2008 13:17:09 +0000 Subject: [PATCH] Patch regex concept checks and TR1 library to work with VC9 + MS TR1 feature pack. [SVN r42751] --- include/boost/regex/concepts.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/regex/concepts.hpp b/include/boost/regex/concepts.hpp index d9005463..0f5677a2 100644 --- a/include/boost/regex/concepts.hpp +++ b/include/boost/regex/concepts.hpp @@ -235,7 +235,7 @@ template struct BaseRegexConcept { typedef typename Regex::value_type value_type; - typedef typename Regex::size_type size_type; + //typedef typename Regex::size_type size_type; typedef typename Regex::flag_type flag_type; typedef typename Regex::locale_type locale_type; typedef input_iterator_archetype input_iterator_type; @@ -370,7 +370,7 @@ struct BaseRegexConcept const Regex ce; bool b = ce.empty(); ignore_unused_variable_warning(b); - size_type i = ce.mark_count(); + unsigned i = ce.mark_count(); ignore_unused_variable_warning(i); m_flags = ce.flags(); e.imbue(ce.getloc()); @@ -533,7 +533,7 @@ struct BaseRegexConcept pointer_type m_pointer; flag_type m_flags; - size_type m_size; + std::size_t m_size; input_iterator_type in1, in2; const sub_match_type m_sub; const value_type m_char; @@ -557,7 +557,7 @@ template struct RegexConcept { typedef typename Regex::value_type value_type; - typedef typename Regex::size_type size_type; + //typedef typename Regex::size_type size_type; typedef typename Regex::flag_type flag_type; typedef typename Regex::locale_type locale_type;