forked from boostorg/regex
Fixed partial ordering macro names
[SVN r11298]
This commit is contained in:
@ -40,10 +40,6 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
|
|||||||
re_set_long* set_,
|
re_set_long* set_,
|
||||||
const reg_expression<charT, traits_type, Allocator>& e)
|
const reg_expression<charT, traits_type, Allocator>& e)
|
||||||
{
|
{
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
# pragma warning(push)
|
|
||||||
# pragma warning(disable: 4800)
|
|
||||||
#endif
|
|
||||||
const charT* p = (const charT*)(set_+1);
|
const charT* p = (const charT*)(set_+1);
|
||||||
iterator ptr;
|
iterator ptr;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
@ -144,9 +140,6 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
|
|||||||
if(traits_inst.is_class(col, set_->cclasses) == true)
|
if(traits_inst.is_class(col, set_->cclasses) == true)
|
||||||
return set_->isnot ? next : ++next;
|
return set_->isnot ? next : ++next;
|
||||||
return set_->isnot ? ++next : next;
|
return set_->isnot ? ++next : next;
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
# pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template <class iterator, class Allocator>
|
template <class iterator, class Allocator>
|
||||||
@ -267,10 +260,6 @@ bool query_match_aux(iterator first,
|
|||||||
_priv_match_data<iterator, Allocator>& pd,
|
_priv_match_data<iterator, Allocator>& pd,
|
||||||
iterator* restart)
|
iterator* restart)
|
||||||
{
|
{
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
# pragma warning(push)
|
|
||||||
# pragma warning(disable: 4800)
|
|
||||||
#endif
|
|
||||||
typedef access_t<charT, traits, Allocator2> access;
|
typedef access_t<charT, traits, Allocator2> access;
|
||||||
|
|
||||||
if(e.flags() & regbase::failbit)
|
if(e.flags() & regbase::failbit)
|
||||||
@ -955,9 +944,6 @@ bool query_match_aux(iterator first,
|
|||||||
// if we get to here then everything has failed
|
// if we get to here then everything has failed
|
||||||
// and no match was found:
|
// and no match was found:
|
||||||
return false;
|
return false;
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
# pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
|
#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
|
||||||
} // namespace
|
} // namespace
|
||||||
@ -1033,7 +1019,7 @@ struct grep_search_predicate
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#if !defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) && !defined(BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING)
|
#if !defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
|
||||||
|
|
||||||
template <class iterator, class Allocator>
|
template <class iterator, class Allocator>
|
||||||
inline const match_results_base<iterator, Allocator>& grep_out_type(const grep_search_predicate<iterator, Allocator>& o, const Allocator&)
|
inline const match_results_base<iterator, Allocator>& grep_out_type(const grep_search_predicate<iterator, Allocator>& o, const Allocator&)
|
||||||
@ -1545,9 +1531,6 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
|
|||||||
}
|
}
|
||||||
|
|
||||||
return cmatches;
|
return cmatches;
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
# pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
|
#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
|
||||||
} // namespace {anon}
|
} // namespace {anon}
|
||||||
@ -1586,7 +1569,7 @@ bool regex_match(iterator first, iterator last, const reg_expression<charT, trai
|
|||||||
}
|
}
|
||||||
//
|
//
|
||||||
// query_match convenience interfaces:
|
// query_match convenience interfaces:
|
||||||
#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
|
#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||||
//
|
//
|
||||||
// this isn't really a partial specialisation, but template function
|
// this isn't really a partial specialisation, but template function
|
||||||
// overloading - if the compiler doesn't support partial specialisation
|
// overloading - if the compiler doesn't support partial specialisation
|
||||||
@ -1693,10 +1676,6 @@ inline bool regex_match(const std::basic_string<wchar_t>& s,
|
|||||||
template <class iterator, class Allocator, class charT, class traits, class Allocator2>
|
template <class iterator, class Allocator, class charT, class traits, class Allocator2>
|
||||||
bool regex_search(iterator first, iterator last, match_results<iterator, Allocator>& m, const reg_expression<charT, traits, Allocator2>& e, unsigned flags = match_default)
|
bool regex_search(iterator first, iterator last, match_results<iterator, Allocator>& m, const reg_expression<charT, traits, Allocator2>& e, unsigned flags = match_default)
|
||||||
{
|
{
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
# pragma warning(push)
|
|
||||||
# pragma warning(disable: 4800)
|
|
||||||
#endif
|
|
||||||
if(e.flags() & regbase::failbit)
|
if(e.flags() & regbase::failbit)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@ -1704,14 +1683,11 @@ bool regex_search(iterator first, iterator last, match_results<iterator, Allocat
|
|||||||
typedef typename traits::uchar_type traits_uchar_type;
|
typedef typename traits::uchar_type traits_uchar_type;
|
||||||
|
|
||||||
return re_detail::reg_grep2(re_detail::grep_search_predicate<iterator, Allocator>(&m), first, last, e, flags, m.allocator());
|
return re_detail::reg_grep2(re_detail::grep_search_predicate<iterator, Allocator>(&m), first, last, e, flags, m.allocator());
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
# pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// regex_search convenience interfaces:
|
// regex_search convenience interfaces:
|
||||||
#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
|
#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||||
//
|
//
|
||||||
// this isn't really a partial specialisation, but template function
|
// this isn't really a partial specialisation, but template function
|
||||||
// overloading - if the compiler doesn't support partial specialisation
|
// overloading - if the compiler doesn't support partial specialisation
|
||||||
@ -1782,7 +1758,7 @@ inline unsigned int regex_grep(Predicate foo, iterator first, iterator last, con
|
|||||||
|
|
||||||
//
|
//
|
||||||
// regex_grep convenience interfaces:
|
// regex_grep convenience interfaces:
|
||||||
#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
|
#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||||
//
|
//
|
||||||
// this isn't really a partial specialisation, but template function
|
// this isn't really a partial specialisation, but template function
|
||||||
// overloading - if the compiler doesn't support partial specialisation
|
// overloading - if the compiler doesn't support partial specialisation
|
||||||
|
@ -61,10 +61,6 @@ template <class OutputIterator, class charT, class Traits1, class Alloc1, class
|
|||||||
bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
|
bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
|
||||||
(const match_results<iterator_type, Alloc2>& what)
|
(const match_results<iterator_type, Alloc2>& what)
|
||||||
{
|
{
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
# pragma warning(push)
|
|
||||||
# pragma warning(disable: 4800)
|
|
||||||
#endif
|
|
||||||
*p_last = what[0].second;
|
*p_last = what[0].second;
|
||||||
if(what.size() > 1)
|
if(what.size() > 1)
|
||||||
{
|
{
|
||||||
@ -90,9 +86,6 @@ bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
|
|||||||
//
|
//
|
||||||
// initial null, do nothing:
|
// initial null, do nothing:
|
||||||
return true;
|
return true;
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
# pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace re_detail
|
} // namespace re_detail
|
||||||
|
@ -126,11 +126,6 @@ struct BOOST_REGEX_DECL c_traits_base : public regex_traits_base
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
enum{
|
enum{
|
||||||
//
|
|
||||||
// these values *must* have the same values as their Win32
|
|
||||||
// equivalents, in order to share data between the two traits
|
|
||||||
// classes (we will static-assert that later):
|
|
||||||
//
|
|
||||||
char_class_none = 0,
|
char_class_none = 0,
|
||||||
char_class_alpha = 0x0001,
|
char_class_alpha = 0x0001,
|
||||||
char_class_cntrl = 0x0002,
|
char_class_cntrl = 0x0002,
|
||||||
|
@ -82,7 +82,7 @@ bool query_match(iterator first, iterator last, boost::match_results<iterator, A
|
|||||||
|
|
||||||
//
|
//
|
||||||
// query_match convenience interfaces:
|
// query_match convenience interfaces:
|
||||||
#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
|
#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||||
//
|
//
|
||||||
// this isn't really a partial specialisation, but template function
|
// this isn't really a partial specialisation, but template function
|
||||||
// overloading - if the compiler doesn't support partial specialisation
|
// overloading - if the compiler doesn't support partial specialisation
|
||||||
@ -155,7 +155,7 @@ bool reg_search(iterator first, iterator last, boost::match_results<iterator, Al
|
|||||||
|
|
||||||
//
|
//
|
||||||
// reg_search convenience interfaces:
|
// reg_search convenience interfaces:
|
||||||
#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
|
#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||||
//
|
//
|
||||||
// this isn't really a partial specialisation, but template function
|
// this isn't really a partial specialisation, but template function
|
||||||
// overloading - if the compiler doesn't support partial specialisation
|
// overloading - if the compiler doesn't support partial specialisation
|
||||||
@ -231,7 +231,7 @@ inline unsigned int reg_grep(Predicate foo, iterator first, iterator last, const
|
|||||||
|
|
||||||
//
|
//
|
||||||
// reg_grep convenience interfaces:
|
// reg_grep convenience interfaces:
|
||||||
#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
|
#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||||
//
|
//
|
||||||
// this isn't really a partial specialisation, but template function
|
// this isn't really a partial specialisation, but template function
|
||||||
// overloading - if the compiler doesn't support partial specialisation
|
// overloading - if the compiler doesn't support partial specialisation
|
||||||
|
@ -115,7 +115,7 @@ template std::size_t regex_split(test_string_type*,
|
|||||||
|
|
||||||
template std::size_t regex_split(test_string_type*, test_string_type&);
|
template std::size_t regex_split(test_string_type*, test_string_type&);
|
||||||
|
|
||||||
#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
|
#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||||
//
|
//
|
||||||
// the following prototypes are only available if partial ordering
|
// the following prototypes are only available if partial ordering
|
||||||
// of template functions is supported:
|
// of template functions is supported:
|
||||||
|
@ -246,7 +246,7 @@ void cpp_tests(const reg_expression<C, T, A>& e, bool recurse = true)
|
|||||||
debug_iterator<string_type::iterator> y(search_text.end(), search_text.begin(), search_text.end());
|
debug_iterator<string_type::iterator> y(search_text.end(), search_text.begin(), search_text.end());
|
||||||
grep_test_predicate<debug_iterator<string_type::iterator>, allocator_type> oi(x, y);
|
grep_test_predicate<debug_iterator<string_type::iterator>, allocator_type> oi(x, y);
|
||||||
regex_grep(oi, x, y, e, flags[3]);
|
regex_grep(oi, x, y, e, flags[3]);
|
||||||
#if !defined(BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING)
|
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
|
||||||
if(!recurse)
|
if(!recurse)
|
||||||
{
|
{
|
||||||
std::basic_string<char_t> s(search_text.begin(), search_text.end());
|
std::basic_string<char_t> s(search_text.begin(), search_text.end());
|
||||||
@ -309,7 +309,7 @@ void cpp_tests(const reg_expression<C, T, A>& e, bool recurse = true)
|
|||||||
|
|
||||||
//
|
//
|
||||||
// now try alternative forms of regex_search if available:
|
// now try alternative forms of regex_search if available:
|
||||||
#if !defined(BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING)
|
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
|
||||||
if(!recurse)
|
if(!recurse)
|
||||||
{
|
{
|
||||||
std::basic_string<char_t> s(search_text.begin(), search_text.end());
|
std::basic_string<char_t> s(search_text.begin(), search_text.end());
|
||||||
|
@ -123,7 +123,7 @@ template std::size_t regex_split(test_string_type*,
|
|||||||
|
|
||||||
template std::size_t regex_split(test_string_type*, test_string_type&);
|
template std::size_t regex_split(test_string_type*, test_string_type&);
|
||||||
|
|
||||||
#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
|
#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
|
||||||
//
|
//
|
||||||
// the following prototypes are only available if partial ordering
|
// the following prototypes are only available if partial ordering
|
||||||
// of template functions is supported:
|
// of template functions is supported:
|
||||||
|
Reference in New Issue
Block a user