Tidied up msvc-warning suppression code.

[SVN r38562]

include/boost/regex/config.hpp

@@ -86,6 +86,12 @@
 #if defined(BOOST_INTEL) && defined(__cplusplus) && (BOOST_INTEL <= 800)
 #  define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
 #endif
+/*
+ * Visual C++ doesn't support external templates with C++ extensions turned off:
+ */
+#if defined(_MSC_VER) && !defined(_MSC_EXTENSIONS)
+#  define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
+#endif
 
 /*
  * If there isn't good enough wide character support then there will

include/boost/regex/pattern_except.hpp

@@ -37,7 +37,7 @@ namespace boost{
 #pragma warning(push)
 #pragma warning(disable : 4275)
 #endif
-   class BOOST_REGEX_DECL regex_error : public std::runtime_error
+class BOOST_REGEX_DECL regex_error : public std::runtime_error
 {
 public:
    explicit regex_error(const std::string& s, regex_constants::error_type err = regex_constants::error_unknown, std::ptrdiff_t pos = 0);
@@ -70,6 +70,9 @@ void raise_error(const traits& t, regex_constants::error_type code)
 
 }
 
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX

include/boost/regex/v4/basic_regex.hpp

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

include/boost/regex/v4/basic_regex_creator.hpp

@@ -24,6 +24,11 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4800)
+#endif
+
 namespace boost{
 
 namespace re_detail{
@@ -1289,6 +1294,10 @@ void basic_regex_creator<charT, traits>::probe_leading_repeat(re_syntax_base* st
 
 } // namespace boost
 
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
+
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
 #endif

include/boost/regex/v4/basic_regex_parser.hpp

@@ -28,7 +28,7 @@ namespace re_detail{
 
 #ifdef BOOST_MSVC
 #pragma warning(push)
-#pragma warning(disable:4244)
+#pragma warning(disable:4244 4800)
 #endif
 
 template <class charT, class traits>

include/boost/regex/v4/perl_matcher.hpp

@@ -18,6 +18,11 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4800)
+#endif
+
 namespace boost{
 namespace re_detail{
 
@@ -512,6 +517,10 @@ private:
 
 } // namespace boost
 
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
+
 //
 // include the implementation of perl_matcher:
 //

include/boost/regex/v4/perl_matcher_common.hpp

@@ -27,6 +27,10 @@
 #ifdef __BORLANDC__
 #  pragma option push -w-8008 -w-8066
 #endif
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4800)
+#endif
 
 namespace boost{
 namespace re_detail{
@@ -938,6 +942,10 @@ bool perl_matcher<BidiIterator, Allocator, traits>::find_restart_lit()
 
 } // namespace boost
 
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
+
 #ifdef __BORLANDC__
 #  pragma option pop
 #endif

include/boost/regex/v4/perl_matcher_non_recursive.hpp

@@ -25,6 +25,10 @@
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_PREFIX
 #endif
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4800)
+#endif
 
 namespace boost{
 namespace re_detail{
@@ -1358,6 +1362,10 @@ bool perl_matcher<BidiIterator, Allocator, traits>::unwind_non_greedy_repeat(boo
 } // namespace re_detail
 } // namespace boost
 
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
+
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
 #endif

include/boost/regex/v4/regex_split.hpp

@@ -27,6 +27,11 @@ namespace boost{
 #  include BOOST_ABI_PREFIX
 #endif
 
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4800)
+#endif
+
 namespace re_detail{
 
 template <class charT>
@@ -138,6 +143,10 @@ inline std::size_t regex_split(OutputIterator out,
    return regex_split(out, s, re_detail::get_default_expression(charT(0)), match_default, UINT_MAX);
 }
 
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
+
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
 #endif

include/boost/regex/v4/regex_workaround.hpp

@@ -66,11 +66,6 @@ using std::distance;
 #ifdef BOOST_REGEX_NO_BOOL
 #  define BOOST_REGEX_MAKE_BOOL(x) static_cast<bool>((x) ? true : false)
 #else
-#  ifdef BOOST_MSVC
-      // warning suppression with VC6:
-#     pragma warning(disable: 4800)
-#     pragma warning(disable: 4786)
-#  endif
 #  define BOOST_REGEX_MAKE_BOOL(x) static_cast<bool>(x)
 #endif
 
@@ -197,7 +192,8 @@ namespace boost{ namespace re_detail{
    }
 
 }} // namespaces
-#endif
+
+#endif // __cplusplus
 
 #endif // include guard
 

include/boost/regex/v4/w32_regex_traits.hpp

@@ -42,6 +42,7 @@
 #ifdef BOOST_MSVC
 #pragma warning(push)
 #pragma warning(disable:4786)
+#pragma warning(disable:4800)
 #endif
 
 namespace boost{