[Boost-commit] svn:boost r59242 - in trunk/boost/spirit/home/support/iterators: . detail

Subject: [Boost-commit] svn:boost r59242 - in trunk/boost/spirit/home/support/iterators: . detail
From: hartmut.kaiser_at_[hidden]
Date: 2010-01-23 16:22:15

Author: hkaiser
Date: 2010-01-23 16:22:14 EST (Sat, 23 Jan 2010)
New Revision: 59242
URL: http://svn.boost.org/trac/boost/changeset/59242

Log:
Spirit:: adding missing function in multi_pass policies.
Text files modified: 
   trunk/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp  |     2 +-                                      
   trunk/boost/spirit/home/support/iterators/detail/combine_policies.hpp     |    16 ++++++++--------                        
   trunk/boost/spirit/home/support/iterators/detail/first_owner_policy.hpp   |     2 +-                                      
   trunk/boost/spirit/home/support/iterators/detail/functor_input_policy.hpp |     2 +-                                      
   trunk/boost/spirit/home/support/iterators/detail/multi_pass.hpp           |     2 +-                                      
   trunk/boost/spirit/home/support/iterators/detail/no_check_policy.hpp      |    14 +-------------                          
   trunk/boost/spirit/home/support/iterators/multi_pass.hpp                  |     4 ++--                                    
   7 files changed, 15 insertions(+), 27 deletions(-)

Modified: trunk/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp	2010-01-23 16:22:14 EST (Sat, 23 Jan 2010)
@@ -56,7 +56,7 @@
 
             // called to verify that everything is ok.
             template <typename MultiPass>
-            static void check(MultiPass const& mp) 
+            static void docheck(MultiPass const& mp) 
             {
                 if (mp.buf_id != mp.shared()->shared_buf_id)
                     boost::throw_exception(illegal_backtracking());

Modified: trunk/boost/spirit/home/support/iterators/detail/combine_policies.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/combine_policies.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/combine_policies.hpp	2010-01-23 16:22:14 EST (Sat, 23 Jan 2010)
@@ -157,8 +157,8 @@
 
         // checking policy functions are forwarded to the Checking type
         template <typename MultiPass>
-        inline static void check(MultiPass const& mp) 
-            { Checking::check(mp); }
+        inline static void docheck(MultiPass const& mp) 
+            { Checking::docheck(mp); }
 
         template <typename MultiPass>
         inline static void clear_queue(MultiPass& mp) 
@@ -207,8 +207,8 @@
 
         // checking policy functions are forwarded to the Checking type
         template <typename MultiPass>
-        inline static void check(MultiPass const& mp) 
-            { Checking::check(mp); }
+        inline static void docheck(MultiPass const& mp) 
+            { Checking::docheck(mp); }
 
         template <typename MultiPass>
         inline static void clear_queue(MultiPass& mp) 
@@ -333,8 +333,8 @@
 
         // checking policy functions are forwarded to the Checking type
         template <typename MultiPass>
-        inline static void check(MultiPass const& mp) 
-            { Checking::check(mp); }
+        inline static void docheck(MultiPass const& mp) 
+            { Checking::docheck(mp); }
 
         template <typename MultiPass>
         inline static void clear_queue(MultiPass& mp) 
@@ -394,8 +394,8 @@
 
         // checking policy functions are forwarded to the Checking type
         template <typename MultiPass>
-        inline static void check(MultiPass const& mp) 
-            { Checking::check(mp); }
+        inline static void docheck(MultiPass const& mp) 
+            { Checking::docheck(mp); }
 
         template <typename MultiPass>
         inline static void clear_queue(MultiPass& mp) 

Modified: trunk/boost/spirit/home/support/iterators/detail/first_owner_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/first_owner_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/first_owner_policy.hpp	2010-01-23 16:22:14 EST (Sat, 23 Jan 2010)
@@ -27,7 +27,7 @@
     struct first_owner
     {
         ///////////////////////////////////////////////////////////////////////
-        struct unique // : detail::default_ownership_policy
+        struct unique : detail::default_ownership_policy
         {
             unique() : first(true) {}
             unique(unique const&) : first(false) {}

Modified: trunk/boost/spirit/home/support/iterators/detail/functor_input_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/functor_input_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/functor_input_policy.hpp	2010-01-23 16:22:14 EST (Sat, 23 Jan 2010)
@@ -105,7 +105,7 @@
         {
             explicit shared(Functor const& x) : curtok(0) {}
 
-            result_type curtok;
+            typename Functor::result_type curtok;
         };
     };
 

Modified: trunk/boost/spirit/home/support/iterators/detail/multi_pass.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/multi_pass.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/multi_pass.hpp	2010-01-23 16:22:14 EST (Sat, 23 Jan 2010)
@@ -130,7 +130,7 @@
         void swap(default_checking_policy&) {}
 
         template <typename MultiPass>
-        static void check(MultiPass const&) {}
+        static void docheck(MultiPass const&) {}
 
         template <typename MultiPass>
         static void clear_queue(MultiPass&) {}

Modified: trunk/boost/spirit/home/support/iterators/detail/no_check_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/no_check_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/no_check_policy.hpp	2010-01-23 16:22:14 EST (Sat, 23 Jan 2010)
@@ -20,19 +20,7 @@
     struct no_check
     {
         ///////////////////////////////////////////////////////////////////////
-        struct unique // : public detail::default_checking_policy
-        {
-            void swap(unique&) {}
-
-            template <typename MultiPass>
-            static void check(MultiPass const&) {}
-
-            template <typename MultiPass>
-            static void clear_queue(MultiPass&) {}
-
-            template <typename MultiPass>
-            static void destroy(MultiPass&) {}
-        };
+        struct unique : public detail::default_checking_policy {};
 
         ///////////////////////////////////////////////////////////////////////
         struct shared {};

Modified: trunk/boost/spirit/home/support/iterators/multi_pass.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/multi_pass.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/multi_pass.hpp	2010-01-23 16:22:14 EST (Sat, 23 Jan 2010)
@@ -105,7 +105,7 @@
 
         reference operator*() const
         {
-            policies_base_type::check(*this);
+            policies_base_type::docheck(*this);
             return policies_base_type::dereference(*this);
         }
         pointer operator->() const
@@ -115,7 +115,7 @@
 
         multi_pass& operator++()
         {
-            policies_base_type::check(*this);
+            policies_base_type::docheck(*this);
             policies_base_type::increment(*this);
             return *this;
         }