Apply patch from #6333.

Fixes #6333.

[SVN r79349]
This commit is contained in:
John Maddock
2012-07-08 11:52:20 +00:00
parent 1567185ba2
commit 0e867247fc
5 changed files with 20 additions and 5 deletions

View File

@ -170,7 +170,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 4660) # pragma warning(disable : 4251 4231)
# if BOOST_MSVC < 1600
# pragma warning(disable : 4660)
# endif
# endif # endif
# if defined(_DLL) && defined(BOOST_MSVC) && (BOOST_MSVC < 1600) # if defined(_DLL) && defined(BOOST_MSVC) && (BOOST_MSVC < 1600)
# include <string> # include <string>

View File

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

View File

@ -84,7 +84,10 @@ template class BOOST_REGEX_DECL ::boost::re_detail::perl_matcher<BOOST_REGEX_CHA
# ifdef BOOST_MSVC # ifdef BOOST_MSVC
# pragma warning(push) # pragma warning(push)
# pragma warning(disable : 4251 4231 4660) # pragma warning(disable : 4251 4231)
# if BOOST_MSVC < 1600
# pragma warning(disable : 4660)
# endif
# endif # endif
template class BOOST_REGEX_TEMPLATE_DECL basic_regex< BOOST_REGEX_CHAR_T BOOST_REGEX_TRAITS_T >; template class BOOST_REGEX_TEMPLATE_DECL basic_regex< BOOST_REGEX_CHAR_T BOOST_REGEX_TRAITS_T >;

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 4660) #pragma warning(disable : 4251 4231)
# if BOOST_MSVC < 1600
# pragma warning(disable : 4660)
# endif
#endif #endif
namespace re_detail{ namespace re_detail{

View File

@ -344,7 +344,10 @@ struct recursion_info
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4251 4231 4660) #pragma warning(disable : 4251 4231)
# if BOOST_MSVC < 1600
# pragma warning(disable : 4660)
# endif
#endif #endif
template <class BidiIterator, class Allocator, class traits> template <class BidiIterator, class Allocator, class traits>