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

Mostly cgg warning suppression, plus some gcc 2.95 workarounds.

Browse Source 
[SVN r20462]
This commit is contained in:
John Maddock
2003-10-23 12:40:47 +00:00
parent f7eb12d9c7
commit 9215a04042
8 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cpp_regex_traits.cpp
View File

@ -155,11 +155,11 @@ parser_buf<charT, traits>::seekpos(pos_type sp, ::std::ios_base::openmode which)
{
if(which & ::std::ios_base::out)
return pos_type(off_type(-1));
std::ptrdiff_t size = this->egptr() - this->eback();
off_type size = this->egptr() - this->eback();
charT* g = this->eback();
if(sp <= size)
if(off_type(sp) <= size)
{
this->setg(g, g + ::std::streamsize(sp), g + size);
this->setg(g, g + off_type(sp), g + size);
}
return pos_type(off_type(-1));
}
@ -234,7 +234,7 @@ message_data<char>::message_data(const std::locale& l, std::string regex_message
#endif
for(std::size_t j = 0; j < s.size(); ++j)
{
syntax_map[s[j]] = (unsigned char)(i);
syntax_map[(unsigned char)s[j]] = (unsigned char)(i);
}
}
@ -640,7 +640,11 @@ message_data<wchar_t>::message_data(const std::locale& l, const std::string& reg
#endif
for(unsigned int j = 0; j < s.size(); ++j)
{
#if defined(WCHAR_MIN) && (WCHAR_MIN == 0)
if(s[j] <= UCHAR_MAX)
#else
if((s[j] <= UCHAR_MAX) && (s[j] >= 0))
#endif
syntax_[s[j]] = static_cast<unsigned char>(i);
else
{

2
src/regex.cpp
View File

@ -123,7 +123,7 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL put_mem_block(void* p)
#else
mem_block_cache block_cache = { 0, };
mem_block_cache block_cache = { 0, 0, };
BOOST_REGEX_DECL void* BOOST_REGEX_CALL get_mem_block()
{