[Boost-commit] svn:boost r60496 - trunk/boost/spirit/home/support/iterators/detail

Subject: [Boost-commit] svn:boost r60496 - trunk/boost/spirit/home/support/iterators/detail
From: hartmut.kaiser_at_[hidden]
Date: 2010-03-11 21:18:24

Author: hkaiser
Date: 2010-03-11 21:18:23 EST (Thu, 11 Mar 2010)
New Revision: 60496
URL: http://svn.boost.org/trac/boost/changeset/60496

Log:
Spirit: fixed #3999: 
Text files modified: 
   trunk/boost/spirit/home/support/iterators/detail/buffering_input_iterator_policy.hpp |     4 ++--                                    
   trunk/boost/spirit/home/support/iterators/detail/combine_policies.hpp                |    24 ++++++++++++------------                
   trunk/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp         |     4 ++--                                    
   trunk/boost/spirit/home/support/iterators/detail/functor_input_policy.hpp            |     4 ++--                                    
   trunk/boost/spirit/home/support/iterators/detail/input_iterator_policy.hpp           |     4 ++--                                    
   trunk/boost/spirit/home/support/iterators/detail/istream_policy.hpp                  |     4 ++--                                    
   trunk/boost/spirit/home/support/iterators/detail/lex_input_policy.hpp                |     2 +-                                      
   trunk/boost/spirit/home/support/iterators/detail/multi_pass.hpp                      |     4 ++--                                    
   trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp      |     8 ++++----                                
   trunk/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp          |     4 ++--                                    
   10 files changed, 31 insertions(+), 31 deletions(-)

Modified: trunk/boost/spirit/home/support/iterators/detail/buffering_input_iterator_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/buffering_input_iterator_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/buffering_input_iterator_policy.hpp	2010-03-11 21:18:23 EST (Thu, 11 Mar 2010)
@@ -63,8 +63,8 @@
             template <typename MultiPass>
             static void destroy(MultiPass&) {}
 
-            template <typename ValueType, typename MultiPass>
-            static ValueType& get_input(MultiPass& mp)
+            template <typename MultiPass>
+            static typename MultiPass::reference get_input(MultiPass& mp)
             {
                 return mp.shared()->get_input();
             }

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-03-11 21:18:23 EST (Thu, 11 Mar 2010)
@@ -117,9 +117,9 @@
         inline static void advance_input(MultiPass& mp)
             { Input::advance_input(mp); }
 
-        template <typename TokenType, typename MultiPass>
-        inline static TokenType& get_input(MultiPass& mp)
-            { return Input::template get_input<TokenType>(mp); }
+        template <typename MultiPass>
+        inline static typename MultiPass::reference get_input(MultiPass& mp)
+            { return Input::get_input(mp); }
 
         template <typename MultiPass>
         inline static bool input_at_eof(MultiPass const& mp)
@@ -193,9 +193,9 @@
         inline static void advance_input(MultiPass& mp)
             { Input::advance_input(mp); }
 
-        template <typename TokenType, typename MultiPass>
-        inline static TokenType& get_input(MultiPass& mp)
-            { return Input::template get_input<TokenType>(mp); }
+        template <typename MultiPass>
+        inline static typename MultiPass::reference get_input(MultiPass& mp)
+            { return Input::get_input(mp); }
 
         template <typename MultiPass>
         inline static bool input_at_eof(MultiPass const& mp)
@@ -282,9 +282,9 @@
         inline static void advance_input(MultiPass& mp)
             { Input::advance_input(mp); }
 
-        template <typename TokenType, typename MultiPass>
-        inline static TokenType& get_input(MultiPass& mp)
-            { return Input::template get_input<TokenType>(mp); }
+        template <typename MultiPass>
+        inline static typename MultiPass::reference get_input(MultiPass& mp)
+            { return Input::get_input(mp); }
 
         template <typename MultiPass>
         inline static bool input_at_eof(MultiPass const& mp)
@@ -380,9 +380,9 @@
         inline static void advance_input(MultiPass& mp)
             { Input::advance_input(mp); }
 
-        template <typename TokenType, typename MultiPass>
-        inline static TokenType& get_input(MultiPass& mp)
-            { return Input::template get_input<TokenType>(mp); }
+        template <typename MultiPass>
+        inline static typename MultiPass::reference get_input(MultiPass& mp)
+            { return Input::get_input(mp); }
 
         template <typename MultiPass>
         inline static bool input_at_eof(MultiPass const& mp)

Modified: trunk/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/fixed_size_queue_policy.hpp	2010-03-11 21:18:23 EST (Thu, 11 Mar 2010)
@@ -57,7 +57,7 @@
             {
                 if (mp.queuePosition == mp.shared()->queuedElements.end())
                 {
-                    return MultiPass::template get_input<Value>(mp);
+                    return MultiPass::get_input(mp);
                 }
                 return *mp.queuePosition;
             }
@@ -75,7 +75,7 @@
                         mp.shared()->queuedElements.pop_front();
 
                     mp.shared()->queuedElements.push_back(
-                        MultiPass::template get_input<Value>(mp));
+                        MultiPass::get_input(mp));
                     MultiPass::advance_input(mp);
                 }
                 ++mp.queuePosition;

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-03-11 21:18:23 EST (Thu, 11 Mar 2010)
@@ -58,8 +58,8 @@
 
         public:
             // get the next token
-            template <typename ValueType, typename MultiPass>
-            static ValueType& get_input(MultiPass& mp)
+            template <typename MultiPass>
+            static typename MultiPass::reference get_input(MultiPass& mp)
             {
                 value_type& curtok = mp.shared()->curtok;
                 if (!input_is_valid(mp, curtok))

Modified: trunk/boost/spirit/home/support/iterators/detail/input_iterator_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/input_iterator_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/input_iterator_policy.hpp	2010-03-11 21:18:23 EST (Thu, 11 Mar 2010)
@@ -66,8 +66,8 @@
             template <typename MultiPass>
             static void destroy(MultiPass&) {}
 
-            template <typename ValueType, typename MultiPass>
-            static ValueType& get_input(MultiPass& mp)
+            template <typename MultiPass>
+            static typename MultiPass::reference get_input(MultiPass& mp)
             {
                 return *mp.shared()->input_;
             }

Modified: trunk/boost/spirit/home/support/iterators/detail/istream_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/istream_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/istream_policy.hpp	2010-03-11 21:18:23 EST (Thu, 11 Mar 2010)
@@ -44,8 +44,8 @@
             template <typename MultiPass>
             static void destroy(MultiPass&) {}
 
-            template <typename ValueType, typename MultiPass>
-            static ValueType& get_input(MultiPass& mp)
+            template <typename MultiPass>
+            static typename MultiPass::reference get_input(MultiPass& mp)
             {
                 if (!mp.shared()->initialized_)
                     advance_input(mp);

Modified: trunk/boost/spirit/home/support/iterators/detail/lex_input_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/lex_input_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/lex_input_policy.hpp	2010-03-11 21:18:23 EST (Thu, 11 Mar 2010)
@@ -38,7 +38,7 @@
 
         public:
             template <typename MultiPass>
-            static value_type& get_input(MultiPass& mp)
+            static typename MultiPass::reference get_input(MultiPass& mp)
             {
                 value_type& curtok = mp.shared()->curtok;
                 if (-1 == 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-03-11 21:18:23 EST (Thu, 11 Mar 2010)
@@ -60,8 +60,8 @@
         template <typename MultiPass, typename TokenType>
         static void advance_input(MultiPass& mp);
 
-        template <typename TokenType, typename MultiPass>
-        static TokenType& get_input(MultiPass& mp);
+        template <typename MultiPass>
+        static typename MultiPass::reference get_input(MultiPass& mp);
 
         template <typename MultiPass>
         static bool input_at_eof(MultiPass const& mp);

Modified: trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp	2010-03-11 21:18:23 EST (Thu, 11 Mar 2010)
@@ -75,8 +75,8 @@
             void swap(unique&) {}
 
             // get the next token
-            template <typename ValueType, typename MultiPass>
-            static ValueType& get_input(MultiPass& mp)
+            template <typename MultiPass>
+            static typename MultiPass::reference get_input(MultiPass& mp)
             {
                 value_type& curtok = mp.shared()->curtok;
                 using namespace split_functor_input_is_valid_test_;
@@ -138,8 +138,8 @@
 
         public:
             // get the next token
-            template <typename ValueType, typename MultiPass>
-            static ValueType& get_input(MultiPass& mp)
+            template <typename MultiPass>
+            static typename MultiPass::reference get_input(MultiPass& mp)
             {
                 value_type& curtok = mp.shared()->curtok;
                 using namespace split_functor_input_is_valid_test_;

Modified: trunk/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp
==============================================================================
--- trunk/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp	(original)
+++ trunk/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp	2010-03-11 21:18:23 EST (Thu, 11 Mar 2010)
@@ -66,7 +66,7 @@
                         queue.clear();
                         mp.queued_position = 0;
                     }
-                    return MultiPass::template get_input<Value>(mp);
+                    return MultiPass::get_input(mp);
                 }
 
                 return queue[mp.queued_position];
@@ -101,7 +101,7 @@
                     }
                     else
                     {
-                        queue.push_back(MultiPass::template get_input<Value>(mp));
+                        queue.push_back(MultiPass::get_input(mp));
                         ++mp.queued_position;
                     }
                     MultiPass::advance_input(mp);