--- /usr/include/boost/spirit/core/impl/match.ipp.orig	2008-03-23 22:15:19 +0600
+++ /usr/include/boost/spirit/core/impl/match.ipp	2008-05-22 15:00:30 +0700
@@ -21,8 +21,8 @@ namespace boost { namespace spirit
     : len(length), val() {}
 
     template <typename T>
-    inline match<T>::match(std::size_t length, ctor_param_t val_)
-    : len(length), val(val_) {}
+    inline match<T>::match(std::size_t len_, ctor_param_t val_)
+    : len(len_), val(val_) {}
 
     template <typename T>
     inline bool
--- /usr/include/boost/spirit/core/scanner/scanner.hpp.orig	2008-03-23 22:15:19 +0600
+++ /usr/include/boost/spirit/core/scanner/scanner.hpp	2008-05-22 15:00:39 +0700
@@ -242,22 +242,22 @@ namespace boost { namespace spirit
         bool
         at_end() const
         {
-            typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
-            return iteration_policy_t::at_end(*this);
+            typedef typename PoliciesT::iteration_policy_t iteration_policy_t_local;
+            return iteration_policy_t_local::at_end(*this);
         }
 
         value_t
         operator*() const
         {
-            typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
-            return iteration_policy_t::filter(iteration_policy_t::get(*this));
+            typedef typename PoliciesT::iteration_policy_t iteration_policy_t_local;
+            return iteration_policy_t_local::filter(iteration_policy_t_local::get(*this));
         }
 
         scanner const&
         operator++() const
         {
-            typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
-            iteration_policy_t::advance(*this);
+            typedef typename PoliciesT::iteration_policy_t iteration_policy_t_local;
+            iteration_policy_t_local::advance(*this);
             return *this;
         }