[Boost-commit] svn:boost r44824 - in trunk/boost/spirit/home: lex/lexer/lexertl support/detail/lexer

From: hartmut.kaiser_at_[hidden]
Date: 2008-04-27 14:37:42

Author: hkaiser
Date: 2008-04-27 14:37:41 EDT (Sun, 27 Apr 2008)
New Revision: 44824
URL: http://svn.boost.org/trac/boost/changeset/44824

Log:
Spirit.Lex: Fixed a gcc 4.3 warning (again, sigh)
Text files modified: 
   trunk/boost/spirit/home/lex/lexer/lexertl/iterator_tokenizer.hpp |    14 ++++++++------                          
   trunk/boost/spirit/home/support/detail/lexer/char_traits.hpp     |     6 +++---                                  
   2 files changed, 11 insertions(+), 9 deletions(-)

Modified: trunk/boost/spirit/home/lex/lexer/lexertl/iterator_tokenizer.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexertl/iterator_tokenizer.hpp	(original)
+++ trunk/boost/spirit/home/lex/lexer/lexertl/iterator_tokenizer.hpp	2008-04-27 14:37:41 EDT (Sun, 27 Apr 2008)
@@ -127,13 +127,14 @@
                 else
                 {
                     typedef typename 
-                        boost::iterator_traits<Iterator>::value_type 
+                        boost::detail::iterator_traits<Iterator>::value_type 
                     value_type;
                     typedef typename 
-                        char_traits<value_type>::index_type 
+                        boost::lexer::char_traits<value_type>::index_type 
                     index_type;
                     
-                    index_type index = char_traits<value_type>::call(*curr_++);
+                    index_type index = 
+                        boost::lexer::char_traits<value_type>::call(*curr_++);
                     std::size_t const state_ = ptr_[
                         lookup_[static_cast<std::size_t>(index)]];
 
@@ -216,13 +217,14 @@
                 else
                 {
                     typedef typename 
-                        boost::iterator_traits<Iterator>::value_type 
+                        boost::detail::iterator_traits<Iterator>::value_type 
                     value_type;
                     typedef typename 
-                        char_traits<value_type>::index_type 
+                        boost::lexer::char_traits<value_type>::index_type 
                     index_type;
                     
-                    index_type index = char_traits<value_type>::call(*curr_++);
+                    index_type index = 
+                        boost::lexer::char_traits<value_type>::call(*curr_++);
                     std::size_t const state_ = ptr_[
                         lookup_[static_cast<std::size_t>(index)]];
 

Modified: trunk/boost/spirit/home/support/detail/lexer/char_traits.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/char_traits.hpp	(original)
+++ trunk/boost/spirit/home/support/detail/lexer/char_traits.hpp	2008-04-27 14:37:41 EDT (Sun, 27 Apr 2008)
@@ -18,7 +18,7 @@
     {
         typedef CharT index_type;
 
-        index_type call(CharT ch)
+        static index_type call(CharT ch)
         {
             return ch;
         }
@@ -29,7 +29,7 @@
     {
         typedef unsigned char index_type;
         
-        index_type call(char ch)
+        static index_type call(char ch)
         {
             return static_cast<index_type>(ch);
         }
@@ -40,7 +40,7 @@
     {
         typedef wchar_t index_type;
 
-        index_type call(wchar_t ch)
+        static index_type call(wchar_t ch)
         {
             return ch;
         }