boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-18 14:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge TR1 patches for VC9 + MS TR1 implementation from main Trunk.

Browse Source 
[SVN r42761]
This commit is contained in:
John Maddock
2008-01-14 13:47:39 +00:00
parent 8fffb1250e
commit a65bccab1c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/regex/concepts.hpp
View File

@ -235,7 +235,7 @@ template <class Regex>
struct BaseRegexConcept struct BaseRegexConcept
{ {
typedef typename Regex::value_type value_type; 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::flag_type flag_type;
typedef typename Regex::locale_type locale_type; typedef typename Regex::locale_type locale_type;
typedef input_iterator_archetype<value_type> input_iterator_type; typedef input_iterator_archetype<value_type> input_iterator_type;
@ -370,7 +370,7 @@ struct BaseRegexConcept
const Regex ce; const Regex ce;
bool b = ce.empty(); bool b = ce.empty();
ignore_unused_variable_warning(b); ignore_unused_variable_warning(b);
size_type i = ce.mark_count(); unsigned i = ce.mark_count();
ignore_unused_variable_warning(i); ignore_unused_variable_warning(i);
m_flags = ce.flags(); m_flags = ce.flags();
e.imbue(ce.getloc()); e.imbue(ce.getloc());
@ -533,7 +533,7 @@ struct BaseRegexConcept
pointer_type m_pointer; pointer_type m_pointer;
flag_type m_flags; flag_type m_flags;
size_type m_size; std::size_t m_size;
input_iterator_type in1, in2; input_iterator_type in1, in2;
const sub_match_type m_sub; const sub_match_type m_sub;
const value_type m_char; const value_type m_char;
@ -557,7 +557,7 @@ template <class Regex>
struct RegexConcept struct RegexConcept
{ {
typedef typename Regex::value_type value_type; 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::flag_type flag_type;
typedef typename Regex::locale_type locale_type; typedef typename Regex::locale_type locale_type;