diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2013-10-19 08:57:20 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-10-19 08:57:20 +0200 |
| commit | ed6115361006240e3c7b02295599e4534cc55a13 (patch) | |
| tree | 612f12d6c7c49421102041fceb7609db8ab8257e /cutl/details/boost/regex/v4/instances.hpp | |
| parent | af8d1a0139ca105c6830f4ac7c320aca2e1c1f5e (diff) | |
Update internal Boost subset to 1.54.0
Diffstat (limited to 'cutl/details/boost/regex/v4/instances.hpp')
| -rw-r--r-- | cutl/details/boost/regex/v4/instances.hpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cutl/details/boost/regex/v4/instances.hpp b/cutl/details/boost/regex/v4/instances.hpp index 0ebf5c9..831d6ad 100644 --- a/cutl/details/boost/regex/v4/instances.hpp +++ b/cutl/details/boost/regex/v4/instances.hpp @@ -84,7 +84,10 @@ template class BOOST_REGEX_DECL ::cutl_details_boost::re_detail::perl_matcher<BO # ifdef BOOST_MSVC # pragma warning(push) -# pragma warning(disable : 4251 4231 4660) +# pragma warning(disable : 4251 4231) +# if BOOST_MSVC < 1600 +# pragma warning(disable : 4660) +# endif # endif template class BOOST_REGEX_TEMPLATE_DECL basic_regex< BOOST_REGEX_CHAR_T BOOST_REGEX_TRAITS_T >; @@ -118,7 +121,7 @@ template class BOOST_REGEX_TEMPLATE_DECL ::cutl_details_boost::re_detail::perl_m #undef BOOST_REGEX_TEMPLATE_DECL -#elif (defined(__GNUC__) && (__GNUC__ >= 3)) || !defined(BOOST_NO_EXTERN_TEMPLATE) +#elif (defined(__GNUC__) && (__GNUC__ >= 3)) || !defined(BOOST_NO_CXX11_EXTERN_TEMPLATE) # ifndef BOOST_REGEX_INSTANTIATE # ifdef __GNUC__ |