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

From: eric_at_[hidden]
Date: 2007-10-17 00:26:38

Author: eric_niebler
Date: 2007-10-17 00:26:36 EDT (Wed, 17 Oct 2007)
New Revision: 40103
URL: http://svn.boost.org/trac/boost/changeset/40103

Log:
misc cleann-up from Dave Jenkins
Text files modified: 
   trunk/boost/xpressive/detail/detail_fwd.hpp      |     6 ------                                  
   trunk/boost/xpressive/detail/utility/symbols.hpp |     3 +++                                     
   trunk/boost/xpressive/proto/context/default.hpp  |     2 +-                                      
   trunk/boost/xpressive/proto/traits.hpp           |     2 +-                                      
   4 files changed, 5 insertions(+), 8 deletions(-)

Modified: trunk/boost/xpressive/detail/detail_fwd.hpp
==============================================================================
--- trunk/boost/xpressive/detail/detail_fwd.hpp	(original)
+++ trunk/boost/xpressive/detail/detail_fwd.hpp	2007-10-17 00:26:36 EDT (Wed, 17 Oct 2007)
@@ -174,9 +174,6 @@
     template<typename BidiIter>
     struct regex_impl;
 
-    template<typename BidiIter>
-    struct regex_matcher;
-
     struct epsilon_matcher;
 
     template<typename BidiIter>
@@ -194,9 +191,6 @@
     template<typename Xpr>
     struct lookbehind_matcher;
 
-    template<typename Cond>
-    struct assert_word_placeholder;
-
     template<bool IsBoundary>
     struct word_boundary;
 

Modified: trunk/boost/xpressive/detail/utility/symbols.hpp
==============================================================================
--- trunk/boost/xpressive/detail/utility/symbols.hpp	(original)
+++ trunk/boost/xpressive/detail/utility/symbols.hpp	2007-10-17 00:26:36 EDT (Wed, 17 Oct 2007)
@@ -24,6 +24,7 @@
 #include <boost/range/result_iterator.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/shared_ptr.hpp>
 
 namespace boost { namespace xpressive { namespace detail
@@ -116,7 +117,9 @@
                 result_type result;
             };
             node* hi;
+            #ifdef BOOST_DISABLE_THREADS
             long tau;
+            #endif
         };
 
         ///////////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/xpressive/proto/context/default.hpp
==============================================================================
--- trunk/boost/xpressive/proto/context/default.hpp	(original)
+++ trunk/boost/xpressive/proto/context/default.hpp	2007-10-17 00:26:36 EDT (Wed, 17 Oct 2007)
@@ -127,7 +127,7 @@
             //BOOST_MPL_ASSERT((is_same<void(*)(),  result_of_fixup<void(* const &)()>::type>));
             //BOOST_MPL_ASSERT((is_same<void(*)(),  result_of_fixup<void(&)()>::type>));
 
-        #if BOOST_WORKAROUND(BOOST_MSVC, == 1400)
+        #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
             template<typename T> T &make_ref_(T &t);
             template<typename T> T const &make_ref_(T const &t);
             #define BOOST_PROTO_REF(x) detail::make_ref_(x)

Modified: trunk/boost/xpressive/proto/traits.hpp
==============================================================================
--- trunk/boost/xpressive/proto/traits.hpp	(original)
+++ trunk/boost/xpressive/proto/traits.hpp	2007-10-17 00:26:36 EDT (Wed, 17 Oct 2007)
@@ -49,7 +49,7 @@
         #define BOOST_PROTO_IS_ARRAY_(T) boost::is_array<T>
     #endif
 
-    #if BOOST_WORKAROUND( BOOST_MSVC, == 1400 )
+    #if BOOST_WORKAROUND( BOOST_MSVC, >= 1400 )
         #pragma warning(push)
         #pragma warning(disable: 4180) // warning C4180: qualifier applied to function type has no meaning; ignored
     #endif