[Uml-devel] branches/work/soc-umbrello

[Gopala Krishna A]

SVN commit 942481 by gopala:

Merged revisions 912902 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r912902 | gopala | 2009-01-18 18:45:20 +0530 (Sun, 18 Jan 2009) | 6 lines
  
  BUG: 177755
  
  Fix compilation issue with boost-1.37 by avoiding the inappropriate
  non-forward usage of spirit::position_iterator (CharIterator).
........


 _M            . (directory)  
 M  +2 -2      umbrello/codeimport/kdevcppparser/lexer.h  
 M  +2 -2      umbrello/codeimport/kdevcppparser/preprocesslexer.h  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902
--- branches/work/soc-umbrello/umbrello/codeimport/kdevcppparser/lexer.h #942480:942481
@@ -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/work/soc-umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h #942480:942481
@@ -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++;
     }