Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r52928 - trunk/boost/spirit/home/support/iterators
From: hartmut.kaiser_at_[hidden]
Date: 2009-05-11 19:42:02


Author: hkaiser
Date: 2009-05-11 19:42:01 EDT (Mon, 11 May 2009)
New Revision: 52928
URL: http://svn.boost.org/trac/boost/changeset/52928

Log:
Spirit: fixed look_ahead iterator
Text files modified:
   trunk/boost/spirit/home/support/iterators/look_ahead.hpp | 31 ++++++++++++++++---------------
   1 files changed, 16 insertions(+), 15 deletions(-)

Modified: trunk/boost/spirit/home/support/iterators/look_ahead.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/look_ahead.hpp (original)
+++ trunk/boost/spirit/home/support/iterators/look_ahead.hpp 2009-05-11 19:42:01 EDT (Mon, 11 May 2009)
@@ -8,10 +8,11 @@
 #if !defined(BOOST_SPIRIT_ITERATOR_LOOK_AHEAD_MAR_16_2007_1253PM)
 #define BOOST_SPIRIT_ITERATOR_LOOK_AHEAD_MAR_16_2007_1253PM
 
-#include <boost/spirit/home/support/iterators/detail/input_iterator_policy.hpp>
 #include <boost/spirit/home/support/iterators/detail/first_owner_policy.hpp>
 #include <boost/spirit/home/support/iterators/detail/no_check_policy.hpp>
+#include <boost/spirit/home/support/iterators/detail/input_iterator_policy.hpp>
 #include <boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp>
+#include <boost/spirit/home/support/iterators/detail/combine_policies.hpp>
 #include <boost/spirit/home/support/iterators/multi_pass.hpp>
 
 namespace boost { namespace spirit
@@ -22,23 +23,23 @@
     ///////////////////////////////////////////////////////////////////////////
     template <typename T, std::size_t N>
     class look_ahead :
- public multi_pass<
- T,
- iterator_policies::input_iterator,
- iterator_policies::first_owner,
- iterator_policies::no_check,
- iterator_policies::fixed_size_queue<N>
+ public multi_pass<T
+ , iterator_policies::default_policy<
+ iterator_policies::first_owner
+ , iterator_policies::no_check
+ , iterator_policies::input_iterator
+ , iterator_policies::fixed_size_queue<N> >
>
     {
     private:
- typedef multi_pass<
- T,
- iterator_policies::input_iterator,
- iterator_policies::first_owner,
- iterator_policies::no_check,
- iterator_policies::fixed_size_queue<N> >
- base_type;
-
+ typedef multi_pass<T
+ , iterator_policies::default_policy<
+ iterator_policies::first_owner
+ , iterator_policies::no_check
+ , iterator_policies::input_iterator
+ , iterator_policies::fixed_size_queue<N> >
+ > base_type;
+
     public:
         look_ahead()
           : base_type() {}


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