[Uml-devel] branches/KDE/4.2/kdesdk/umbrello/umbrello/codeimport/kdevcppparser

[Gopala Krishna A]

SVN commit 913607 by gopala:

Backporting commit 912902, which fixes the compilation issue of
umbrello with the newly released boost 1.37 by avoiding inappropriate
use of non forward behavior of spirit::position_iterator (CharIterator).



 M  +2 -2      lexer.h  
 M  +3 -3      preprocesslexer.h  


--- branches/KDE/4.2/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.h #913606:913607
@@ -105,8 +105,8 @@
     QChar currentChar() const {
       return m_ptr != m_endPtr ? *m_ptr : QChar::null;
     }
-    bool eof() const {return m_ptr >= m_endPtr;}
-    int length() const {return m_endPtr - m_ptr;}
+    bool eof() const {return m_ptr == m_endPtr;}
+    int length() const {return std::distance(m_ptr, m_endPtr);}
     void nextChar() {
       QChar l_current = *m_ptr++;
       switch( l_current.toAscii()) {
--- branches/KDE/4.2/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h #913606:913607
@@ -29,7 +29,7 @@
   bool isdigit_( QChar const& c);
 }}}
 
-// must be first for msvc (see position.h for more informations)
+// must be first for msvc (see position.h for more information)
 #include "position.h"
 #include "driver.h"
 #include "skip_rule.hpp"
@@ -264,8 +264,8 @@
     QChar currentChar() const {
       return m_ptr != m_endPtr ? *m_ptr : QChar::null;
     }
-    bool eof() const {return m_ptr >= m_endPtr;}
-    int length() const {return m_endPtr - m_ptr;}
+    bool eof() const {return m_ptr == m_endPtr;}
+    int length() const {return std::distance(m_ptr, m_endPtr);}
     void nextChar() {
       QChar l_current = *m_ptr++;
     }