mirror of
https://github.com/boostorg/regex.git
synced 2025-07-17 06:12:10 +02:00
Merge fixes from Trunk - mainly warning suppression.
[SVN r65720]
This commit is contained in:
@ -14,6 +14,9 @@ project
|
||||
<toolset>gcc:<warnings>all
|
||||
<toolset>gcc:<cxxflags>-Wextra
|
||||
<define>U_USING_ICU_NAMESPACE=0
|
||||
<toolset>gcc-mw:<link>static
|
||||
<toolset>gcc-mingw:<link>static
|
||||
<toolset>gcc-cygwin:<link>static
|
||||
;
|
||||
|
||||
rule regex-test-run ( sources + : input * : name * )
|
||||
@ -74,3 +77,4 @@ test-suite regex-examples :
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -54,9 +54,9 @@ void search(std::istream& is)
|
||||
while(have_more)
|
||||
{
|
||||
// how much do we copy forward from last try:
|
||||
unsigned leftover = (buf + sizeof(buf)) - next_pos;
|
||||
std::ptrdiff_t leftover = (buf + sizeof(buf)) - next_pos;
|
||||
// and how much is left to fill:
|
||||
unsigned size = next_pos - buf;
|
||||
std::ptrdiff_t size = next_pos - buf;
|
||||
// copy forward whatever we have left:
|
||||
std::memmove(buf, next_pos, leftover);
|
||||
// fill the rest from the stream:
|
||||
|
@ -44,9 +44,9 @@ void search(std::istream& is)
|
||||
while(have_more)
|
||||
{
|
||||
// how much do we copy forward from last try:
|
||||
unsigned leftover = (buf + sizeof(buf)) - next_pos;
|
||||
std::ptrdiff_t leftover = (buf + sizeof(buf)) - next_pos;
|
||||
// and how much is left to fill:
|
||||
unsigned size = next_pos - buf;
|
||||
std::ptrdiff_t size = next_pos - buf;
|
||||
// copy forward whatever we have left:
|
||||
std::memmove(buf, next_pos, leftover);
|
||||
// fill the rest from the stream:
|
||||
|
Reference in New Issue
Block a user