forked from boostorg/regex
Fixed MSVC warnings
[SVN r15140]
This commit is contained in:
@ -451,6 +451,11 @@ class match_results;
|
|||||||
// regular expression:
|
// regular expression:
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#ifdef BOOST_MSVC
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable : 4251 4231 4660)
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef BOOST_REGEX_NO_FWD
|
#ifdef BOOST_REGEX_NO_FWD
|
||||||
template <class charT, class traits = regex_traits<charT>, class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
|
template <class charT, class traits = regex_traits<charT>, class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
|
||||||
#else
|
#else
|
||||||
@ -703,6 +708,10 @@ protected:
|
|||||||
static bool BOOST_REGEX_CALL can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_narrow_type&);
|
static bool BOOST_REGEX_CALL can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_narrow_type&);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef BOOST_MSVC
|
||||||
|
#pragma warning (pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
template <class charT, class traits, class Allocator>
|
template <class charT, class traits, class Allocator>
|
||||||
inline void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::swap(reg_expression& that)throw()
|
inline void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::swap(reg_expression& that)throw()
|
||||||
{
|
{
|
||||||
|
@ -68,13 +68,6 @@ template class BOOST_REGEX_DECL match_results<std::basic_string<BOOST_REGEX_CHAR
|
|||||||
#pragma warning(push)
|
#pragma warning(push)
|
||||||
#pragma warning(disable : 4251 4231 4660)
|
#pragma warning(disable : 4251 4231 4660)
|
||||||
|
|
||||||
//
|
|
||||||
// these next two lines are deliberate: raw_storage is used only internally
|
|
||||||
// by reg_expression it is not exported from the dll:
|
|
||||||
//
|
|
||||||
template class re_detail::raw_storage< BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T) >;
|
|
||||||
template class BOOST_REGEX_DECL re_detail::raw_storage< BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T) >;
|
|
||||||
|
|
||||||
template class BOOST_REGEX_DECL regex_traits< BOOST_REGEX_CHAR_T >;
|
template class BOOST_REGEX_DECL regex_traits< BOOST_REGEX_CHAR_T >;
|
||||||
template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
|
template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
|
||||||
template class BOOST_REGEX_DECL re_detail::match_results_base<BOOST_REGEX_CHAR_T const*, BOOST_DEFAULT_ALLOCATOR(re_detail::def_alloc_param_traits<BOOST_REGEX_CHAR_T const*>::type)>;
|
template class BOOST_REGEX_DECL re_detail::match_results_base<BOOST_REGEX_CHAR_T const*, BOOST_DEFAULT_ALLOCATOR(re_detail::def_alloc_param_traits<BOOST_REGEX_CHAR_T const*>::type)>;
|
||||||
@ -168,3 +161,4 @@ template void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::cow();
|
|||||||
|
|
||||||
#endif // BOOST_REGEX_NO_EXTERNAL_TEMPLATES
|
#endif // BOOST_REGEX_NO_EXTERNAL_TEMPLATES
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user