feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Fixed more warnings, rolled back some regex changes that seem to be causing problems on 64-bit platforms.

Browse Source 
[SVN r14063]
This commit is contained in:
John Maddock
2002-05-30 11:07:05 +00:00
parent bbbd65c2e4
commit 53de3c4ae6
4 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/boost/regex/detail/regex_match.hpp
View File

@ -31,7 +31,7 @@ namespace boost{
namespace re_detail{
#ifdef __BORLANDC__
#pragma option push -a4 -b -Ve -pc -w-8026
#pragma option push -a4 -b -Ve -pc -w-8026 -w-8027
#endif
//
@ -55,6 +55,13 @@ inline int string_compare(const std::wstring& s, const wchar_t* p)
# define STR_COMP(s,p) string_compare(s,p)
#endif
template<class charT>
inline const charT* re_skip_past_null(const charT* p)
{
while (*p != 0) ++p;
return ++p;
}
template <class iterator, class charT, class traits_type, class Allocator>
iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
iterator last,
@ -103,8 +110,7 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
if(*p == 0) // if null we've matched
return set_->isnot ? next : (ptr == next) ? ++next : ptr;
while(*p)++p;
++p; // skip null
p = re_skip_past_null(p); // skip null
}
}
@ -283,6 +289,11 @@ bool query_match_aux(iterator first,
_priv_match_data<iterator, Allocator>& pd,
iterator* restart)
{
# ifdef BOOST_MSVC
# pragma warning(push)
# pragma warning(disable: 4127)
#endif
typedef access_t<charT, traits, Allocator2> access;
if(e.flags() & regbase::failbit)
@ -1030,6 +1041,9 @@ bool query_match_aux(iterator first,
// if we get to here then everything has failed
// and no match was found:
return false;
# ifdef BOOST_MSVC
# pragma warning(pop)
#endif
}
#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
} // namespace
@ -1257,9 +1271,9 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
case regbase::restart_fixed_lit:
{
const kmp_info<charT>* info = access::get_kmp(e);
std::ptrdiff_t len = info->len;
int len = info->len;
const charT* x = info->pstr;
std::ptrdiff_t j = 0;
int j = 0;
bool icase = e.flags() & regbase::icase;
while (first != last)
{
@ -1913,3 +1927,5 @@ inline unsigned int regex_grep(bool (*foo)(const match_results<std::basic_string