From de9ecb740795cb3295ec1dbb56eb469d467a314b Mon Sep 17 00:00:00 2001 From: John Maddock Date: Tue, 3 Sep 2002 10:14:30 +0000 Subject: [PATCH] Fixed MSVC warnings [SVN r15140] --- include/boost/regex.hpp | 9 +++++++++ include/boost/regex/detail/instances.hpp | 8 +------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/boost/regex.hpp b/include/boost/regex.hpp index b07ca322..d3da66ee 100644 --- a/include/boost/regex.hpp +++ b/include/boost/regex.hpp @@ -451,6 +451,11 @@ class match_results; // regular expression: // +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable : 4251 4231 4660) +#endif + #ifdef BOOST_REGEX_NO_FWD template , class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) > #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&); }; +#ifdef BOOST_MSVC +#pragma warning (pop) +#endif + template inline void BOOST_REGEX_CALL reg_expression::swap(reg_expression& that)throw() { diff --git a/include/boost/regex/detail/instances.hpp b/include/boost/regex/detail/instances.hpp index b286a947..5d30f1ab 100644 --- a/include/boost/regex/detail/instances.hpp +++ b/include/boost/regex/detail/instances.hpp @@ -68,13 +68,6 @@ template class BOOST_REGEX_DECL match_results; -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 reg_expression< BOOST_REGEX_CHAR_T >; template class BOOST_REGEX_DECL re_detail::match_results_base::type)>; @@ -168,3 +161,4 @@ template void BOOST_REGEX_CALL match_results_base::cow(); #endif // BOOST_REGEX_NO_EXTERNAL_TEMPLATES +