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

Fix exception specification and msvc warning push/pop.

Browse Source
This commit is contained in:
jzmaddock
2020-01-21 10:14:37 +00:00
parent 2cd947f7c4
commit f64c22870f
3 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/regex/pattern_except.hpp
View File

@ -52,7 +52,7 @@ class BOOST_REGEX_DECL regex_error : public std::runtime_error
public: public:
explicit regex_error(const std::string& s, regex_constants::error_type err = regex_constants::error_unknown, std::ptrdiff_t pos = 0); explicit regex_error(const std::string& s, regex_constants::error_type err = regex_constants::error_unknown, std::ptrdiff_t pos = 0);
explicit regex_error(regex_constants::error_type err); explicit regex_error(regex_constants::error_type err);
~regex_error() BOOST_NOEXCEPT; ~regex_error() BOOST_NOEXCEPT_OR_NOTHROW;
regex_constants::error_type code()const regex_constants::error_type code()const
{ return m_error_code; } { return m_error_code; }
std::ptrdiff_t position()const std::ptrdiff_t position()const

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

@ -27,6 +27,13 @@
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
# pragma warning(push) # pragma warning(push)
#pragma warning(disable : 4251)
#if BOOST_MSVC < 1700
# pragma warning(disable : 4231)
#endif
# if BOOST_MSVC < 1600
# pragma warning(disable : 4660)
# endif
#if BOOST_MSVC < 1910 #if BOOST_MSVC < 1910
#pragma warning(disable:4800) #pragma warning(disable:4800)
#endif #endif
@ -362,17 +369,6 @@ struct recursion_info
# pragma warning(pop) # pragma warning(pop)
#endif #endif
#ifdef BOOST_MSVC
#pragma warning(push)
#pragma warning(disable : 4251)
#if BOOST_MSVC < 1700
# pragma warning(disable : 4231)
#endif
# if BOOST_MSVC < 1600
# pragma warning(disable : 4660)
# endif
#endif
template <class BidiIterator, class Allocator, class traits> template <class BidiIterator, class Allocator, class traits>
class perl_matcher class perl_matcher
{ {
@ -601,13 +597,17 @@ private:
} }
perl_matcher(const perl_matcher& that) perl_matcher(const perl_matcher& that)
: m_result(that.m_result), re(that.re), traits_inst(that.traits_inst), rep_obj(0) {} : m_result(that.m_result), re(that.re), traits_inst(that.traits_inst), rep_obj(0) {}
};
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
# pragma warning(pop) # pragma warning(pop)
#endif #endif
};
} // namespace BOOST_REGEX_DETAIL_NS } // namespace BOOST_REGEX_DETAIL_NS
#ifdef BOOST_MSVC
# pragma warning(pop)
#endif
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)
#pragma warning(disable: 4103) #pragma warning(disable: 4103)
@ -621,13 +621,6 @@ private:
} // namespace boost } // namespace boost
#ifdef BOOST_MSVC
# pragma warning(pop)
#endif
#ifdef BOOST_MSVC
# pragma warning(pop)
#endif
// //
// include the implementation of perl_matcher: // include the implementation of perl_matcher:
// //

2
src/regex.cpp
View File

@ -72,7 +72,7 @@ regex_error::regex_error(regex_constants::error_type err)
{ {
} }
regex_error::~regex_error() BOOST_NOEXCEPT regex_error::~regex_error() BOOST_NOEXCEPT_OR_NOTHROW
{ {
} }