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

Tentative fix for msvc warnings.

Browse Source 
See https://github.com/boostorg/regex/issues/61.
Adds warning test case.
This commit is contained in:
jzmaddock
2018-07-22 17:16:21 +01:00
parent 2517588955
commit 7b2ccc0095
15 changed files with 66 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/regex/config.hpp
View File

@ -201,7 +201,10 @@
# define BOOST_REGEX_HAS_OTHER_WCHAR_T # define BOOST_REGEX_HAS_OTHER_WCHAR_T
# ifdef BOOST_MSVC # ifdef BOOST_MSVC
# pragma warning(push) # pragma warning(push)
# pragma warning(disable : 4251 4231) # pragma warning(disable : 4251)
#if BOOST_MSVC < 1700
# pragma warning(disable : 4231)
#endif
# if BOOST_MSVC < 1600 # if BOOST_MSVC < 1600
# pragma warning(disable : 4660) # pragma warning(disable : 4660)
# endif # endif

8
include/boost/regex/v4/basic_regex.hpp
View File

@ -36,10 +36,16 @@
namespace boost{ namespace boost{
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4251 4231 4800) #pragma warning(disable : 4251)
#if BOOST_MSVC < 1700
# pragma warning(disable : 4231)
#endif
#if BOOST_MSVC < 1600 #if BOOST_MSVC < 1600
#pragma warning(disable : 4660) #pragma warning(disable : 4660)
#endif #endif
#if BOOST_MSVC < 1910
#pragma warning(disable:4800)
#endif
#endif #endif
namespace BOOST_REGEX_DETAIL_NS{ namespace BOOST_REGEX_DETAIL_NS{

4
include/boost/regex/v4/basic_regex_creator.hpp
View File

@ -33,7 +33,9 @@
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
# pragma warning(push) # pragma warning(push)
# pragma warning(disable: 4800) #if BOOST_MSVC < 1910
#pragma warning(disable:4800)
#endif
#endif #endif
namespace boost{ namespace boost{

5
include/boost/regex/v4/basic_regex_parser.hpp
View File

@ -35,7 +35,10 @@ namespace BOOST_REGEX_DETAIL_NS{
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:4244 4800) #pragma warning(disable:4244)
#if BOOST_MSVC < 1910
#pragma warning(disable:4800)
#endif
#endif #endif
inline boost::intmax_t umax(mpl::false_ const&) inline boost::intmax_t umax(mpl::false_ const&)

5
include/boost/regex/v4/instances.hpp
View File

@ -84,7 +84,10 @@ template class BOOST_REGEX_DECL ::boost::BOOST_REGEX_DETAIL_NS::perl_matcher<BOO
# ifdef BOOST_MSVC # ifdef BOOST_MSVC
# pragma warning(push) # pragma warning(push)
# pragma warning(disable : 4251 4231) # pragma warning(disable : 4251)
#if BOOST_MSVC < 1700
# pragma warning(disable : 4231)
#endif
# if BOOST_MSVC < 1600 # if BOOST_MSVC < 1600
# pragma warning(disable : 4660) # pragma warning(disable : 4660)
# endif # endif

5
include/boost/regex/v4/match_results.hpp
View File

@ -33,7 +33,10 @@
namespace boost{ namespace boost{
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4251 4231) #pragma warning(disable : 4251)
#if BOOST_MSVC < 1700
# pragma warning(disable : 4231)
#endif
# if BOOST_MSVC < 1600 # if BOOST_MSVC < 1600
# pragma warning(disable : 4660) # pragma warning(disable : 4660)
# endif # endif

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

@ -27,7 +27,9 @@
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
# pragma warning(push) # pragma warning(push)
# pragma warning(disable: 4800) #if BOOST_MSVC < 1910
#pragma warning(disable:4800)
#endif
#endif #endif
namespace boost{ namespace boost{
@ -353,7 +355,10 @@ struct recursion_info
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4251 4231) #pragma warning(disable : 4251)
#if BOOST_MSVC < 1700
# pragma warning(disable : 4231)
#endif
# if BOOST_MSVC < 1600 # if BOOST_MSVC < 1600
# pragma warning(disable : 4660) # pragma warning(disable : 4660)
# endif # endif

4
include/boost/regex/v4/perl_matcher_common.hpp
View File

@ -36,7 +36,9 @@
#endif #endif
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
# pragma warning(push) # pragma warning(push)
# pragma warning(disable: 4800) #if BOOST_MSVC < 1910
#pragma warning(disable:4800)
#endif
#endif #endif
namespace boost{ namespace boost{

5
include/boost/regex/v4/perl_matcher_non_recursive.hpp
View File

@ -34,7 +34,10 @@
#endif #endif
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
# pragma warning(push) # pragma warning(push)
# pragma warning(disable: 4800 4706) # pragma warning(disable: 4706)
#if BOOST_MSVC < 1910
#pragma warning(disable:4800)
#endif
#endif #endif
namespace boost{ namespace boost{

6
include/boost/regex/v4/regex_raw_buffer.hpp
View File

@ -138,12 +138,12 @@ public:
size_type BOOST_REGEX_CALL size() size_type BOOST_REGEX_CALL size()
{ {
return end - start; return size_type(end - start);
} }
size_type BOOST_REGEX_CALL capacity() size_type BOOST_REGEX_CALL capacity()
{ {
return last - start; return size_type(last - start);
} }
void* BOOST_REGEX_CALL data()const void* BOOST_REGEX_CALL data()const
@ -153,7 +153,7 @@ public:
size_type BOOST_REGEX_CALL index(void* ptr) size_type BOOST_REGEX_CALL index(void* ptr)
{ {
return static_cast<pointer>(ptr) - static_cast<pointer>(data()); return size_type(static_cast<pointer>(ptr) - static_cast<pointer>(data()));
} }
void BOOST_REGEX_CALL clear() void BOOST_REGEX_CALL clear()

4
include/boost/regex/v4/regex_split.hpp
View File

@ -36,7 +36,9 @@ namespace boost{
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
# pragma warning(push) # pragma warning(push)
# pragma warning(disable: 4800) #if BOOST_MSVC < 1910
#pragma warning(disable:4800)
#endif
#endif #endif
namespace BOOST_REGEX_DETAIL_NS{ namespace BOOST_REGEX_DETAIL_NS{

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

@ -241,7 +241,7 @@ inline std::ptrdiff_t global_length<char>(const char* p)
template<> template<>
inline std::ptrdiff_t global_length<wchar_t>(const wchar_t* p) inline std::ptrdiff_t global_length<wchar_t>(const wchar_t* p)
{ {
return (std::wcslen)(p); return (std::ptrdiff_t)(std::wcslen)(p);
} }
#endif #endif
template <class charT> template <class charT>

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

@ -51,8 +51,10 @@
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:4786) #pragma warning(disable:4786)
#if BOOST_MSVC < 1910
#pragma warning(disable:4800) #pragma warning(disable:4800)
#endif #endif
#endif
namespace boost{ namespace boost{

5
test/Jamfile.v2
View File

@ -196,3 +196,8 @@ build-project ../example ;
# `quick` target (for CI) # `quick` target (for CI)
run quick.cpp ../build//boost_regex ; run quick.cpp ../build//boost_regex ;
compile test_warnings.cpp
: <toolset>msvc:<warnings>all <toolset>msvc:<warnings-as-errors>on
<toolset>gcc:<warnings>all <toolset>gcc:<warnings-as-errors>on
<toolset>clang:<warnings>all <toolset>clang:<warnings-as-errors>on ;

12
test/test_warnings.cpp Normal file
View File

@ -0,0 +1,12 @@
#ifdef _MSC_VER
#pragma warning(disable:4820 4668)
#endif
#include <boost/regex.hpp>
void test_proc()
{
std::string text, re;
boost::regex exp(re);
regex_match(text, exp);
}