[Boost-commit] svn:boost r39956 - in trunk/boost/xpressive: detail/utility proto

From: eric_at_[hidden]
Date: 2007-10-12 03:04:14

Author: eric_niebler
Date: 2007-10-12 03:04:13 EDT (Fri, 12 Oct 2007)
New Revision: 39956
URL: http://svn.boost.org/trac/boost/changeset/39956

Log:
xpressive works with boost 1.34.1
Text files modified: 
   trunk/boost/xpressive/detail/utility/algorithm.hpp |     3 +++                                     
   trunk/boost/xpressive/proto/matches.hpp            |     9 +++++++++                               
   2 files changed, 12 insertions(+), 0 deletions(-)

Modified: trunk/boost/xpressive/detail/utility/algorithm.hpp
==============================================================================
--- trunk/boost/xpressive/detail/utility/algorithm.hpp	(original)
+++ trunk/boost/xpressive/detail/utility/algorithm.hpp	2007-10-12 03:04:13 EDT (Fri, 12 Oct 2007)
@@ -16,6 +16,7 @@
 #include <string>
 #include <climits>
 #include <algorithm>
+#include <boost/version.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/size.hpp>
@@ -119,10 +120,12 @@
 {};
 
 template<typename T> std::ptrdiff_t is_null_terminated(T const &) { return 0; }
+#if BOOST_VERSION >= 103500
 inline std::ptrdiff_t is_null_terminated(char const *) { return 1; }
 #ifndef BOOST_XPRESSIVE_NO_WREGEX
 inline std::ptrdiff_t is_null_terminated(wchar_t const *) { return 1; }
 #endif
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // data_begin/data_end

Modified: trunk/boost/xpressive/proto/matches.hpp
==============================================================================
--- trunk/boost/xpressive/proto/matches.hpp	(original)
+++ trunk/boost/xpressive/proto/matches.hpp	2007-10-12 03:04:13 EDT (Fri, 12 Oct 2007)
@@ -49,6 +49,11 @@
     # endif
     #endif
 
+    #if defined(_MSC_VER) && (_MSC_VER >= 1020)
+    # pragma warning(push)
+    # pragma warning(disable:4305) // 'specialization' : truncation from 'const int' to 'bool'
+    #endif
+
     namespace boost { namespace proto
     {
 
@@ -476,6 +481,10 @@
         }
     }}
 
+    #if defined(_MSC_VER) && (_MSC_VER >= 1020)
+    # pragma warning(pop)
+    #endif
+
     #endif
 
 #elif BOOST_PP_ITERATION_FLAGS() == 1