|
Boost-Commit : |
From: john_at_[hidden]
Date: 2007-08-10 06:11:04
Author: johnmaddock
Date: 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
New Revision: 38562
URL: http://svn.boost.org/trac/boost/changeset/38562
Log:
Tidied up msvc-warning suppression code.
Text files modified:
trunk/boost/regex/config.hpp | 6 ++++++
trunk/boost/regex/pattern_except.hpp | 5 ++++-
trunk/boost/regex/v4/basic_regex.hpp | 2 +-
trunk/boost/regex/v4/basic_regex_creator.hpp | 9 +++++++++
trunk/boost/regex/v4/basic_regex_parser.hpp | 2 +-
trunk/boost/regex/v4/perl_matcher.hpp | 9 +++++++++
trunk/boost/regex/v4/perl_matcher_common.hpp | 8 ++++++++
trunk/boost/regex/v4/perl_matcher_non_recursive.hpp | 8 ++++++++
trunk/boost/regex/v4/regex_split.hpp | 9 +++++++++
trunk/boost/regex/v4/regex_workaround.hpp | 8 ++------
trunk/boost/regex/v4/w32_regex_traits.hpp | 1 +
11 files changed, 58 insertions(+), 9 deletions(-)
Modified: trunk/boost/regex/config.hpp
==============================================================================
--- trunk/boost/regex/config.hpp (original)
+++ trunk/boost/regex/config.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -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
Modified: trunk/boost/regex/pattern_except.hpp
==============================================================================
--- trunk/boost/regex/pattern_except.hpp (original)
+++ trunk/boost/regex/pattern_except.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -37,7 +37,7 @@
#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 @@
}
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
#ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_SUFFIX
Modified: trunk/boost/regex/v4/basic_regex.hpp
==============================================================================
--- trunk/boost/regex/v4/basic_regex.hpp (original)
+++ trunk/boost/regex/v4/basic_regex.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -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{
Modified: trunk/boost/regex/v4/basic_regex_creator.hpp
==============================================================================
--- trunk/boost/regex/v4/basic_regex_creator.hpp (original)
+++ trunk/boost/regex/v4/basic_regex_creator.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -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 @@
} // namespace boost
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
+
#ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_SUFFIX
#endif
Modified: trunk/boost/regex/v4/basic_regex_parser.hpp
==============================================================================
--- trunk/boost/regex/v4/basic_regex_parser.hpp (original)
+++ trunk/boost/regex/v4/basic_regex_parser.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -28,7 +28,7 @@
#ifdef BOOST_MSVC
#pragma warning(push)
-#pragma warning(disable:4244)
+#pragma warning(disable:4244 4800)
#endif
template <class charT, class traits>
Modified: trunk/boost/regex/v4/perl_matcher.hpp
==============================================================================
--- trunk/boost/regex/v4/perl_matcher.hpp (original)
+++ trunk/boost/regex/v4/perl_matcher.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -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 @@
} // namespace boost
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
+
//
// include the implementation of perl_matcher:
//
Modified: trunk/boost/regex/v4/perl_matcher_common.hpp
==============================================================================
--- trunk/boost/regex/v4/perl_matcher_common.hpp (original)
+++ trunk/boost/regex/v4/perl_matcher_common.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -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 @@
} // namespace boost
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
+
#ifdef __BORLANDC__
# pragma option pop
#endif
Modified: trunk/boost/regex/v4/perl_matcher_non_recursive.hpp
==============================================================================
--- trunk/boost/regex/v4/perl_matcher_non_recursive.hpp (original)
+++ trunk/boost/regex/v4/perl_matcher_non_recursive.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -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 @@
} // namespace re_detail
} // namespace boost
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
+
#ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_SUFFIX
#endif
Modified: trunk/boost/regex/v4/regex_split.hpp
==============================================================================
--- trunk/boost/regex/v4/regex_split.hpp (original)
+++ trunk/boost/regex/v4/regex_split.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -27,6 +27,11 @@
# 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 @@
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
Modified: trunk/boost/regex/v4/regex_workaround.hpp
==============================================================================
--- trunk/boost/regex/v4/regex_workaround.hpp (original)
+++ trunk/boost/regex/v4/regex_workaround.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -66,11 +66,6 @@
#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 @@
}
}} // namespaces
-#endif
+
+#endif // __cplusplus
#endif // include guard
Modified: trunk/boost/regex/v4/w32_regex_traits.hpp
==============================================================================
--- trunk/boost/regex/v4/w32_regex_traits.hpp (original)
+++ trunk/boost/regex/v4/w32_regex_traits.hpp 2007-08-10 06:11:03 EDT (Fri, 10 Aug 2007)
@@ -42,6 +42,7 @@
#ifdef BOOST_MSVC
#pragma warning(push)
#pragma warning(disable:4786)
+#pragma warning(disable:4800)
#endif
namespace boost{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk