boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-19 23:32:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged fixes for #1471 (warning suppression).

Browse Source 
[SVN r41974]
This commit is contained in:
John Maddock
2007-12-11 17:29:58 +00:00
parent a159bacf3f
commit 45891854d9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/regex/v4/cpp_regex_traits.hpp
View File

@ -128,7 +128,7 @@ parser_buf<charT, traits>::seekoff(off_type off, ::std::ios_base::seekdir way, :
break; break;
case ::std::ios_base::cur: case ::std::ios_base::cur:
{ {
std::ptrdiff_t newpos = pos + off; std::ptrdiff_t newpos = static_cast<std::ptrdiff_t>(pos + off);
if((newpos < 0) || (newpos > size)) if((newpos < 0) || (newpos > size))
return pos_type(off_type(-1)); return pos_type(off_type(-1));
else else

9
include/boost/regex/v4/regex_workaround.hpp
View File

@ -150,13 +150,16 @@ namespace boost{ namespace re_detail{
return stdext::unchecked_equal(first, last, with); return stdext::unchecked_equal(first, last, with);
} }
#else
using std::copy;
using std::equal;
#endif
#if BOOST_WORKAROUND(BOOST_MSVC,>=1400) && defined(__STDC_WANT_SECURE_LIB__) && __STDC_WANT_SECURE_LIB__
// use safe versions of strcpy etc: // use safe versions of strcpy etc:
using ::strcpy_s; using ::strcpy_s;
using ::strcat_s; using ::strcat_s;
#else #else
using std::copy;
using std::equal;
inline std::size_t strcpy_s( inline std::size_t strcpy_s(
char *strDestination, char *strDestination,
std::size_t sizeInBytes, std::size_t sizeInBytes,