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

[Gopala Krishna A]

SVN commit 912902 by gopala:

BUG: 177755

Fix compilation issue with boost-1.37 by avoiding the inappropriate
non-forward usage of spirit::position_iterator (CharIterator).



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


--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.h #912901:912902
@@ -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()) {
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h #912901:912902
@@ -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++;
     }