Browse Source

minor bugfixes for other gcc versions

Erik Rodner 11 years ago
parent
commit
b0f5791910
2 changed files with 7 additions and 3 deletions
  1. 1 1
      core/basics/numerictools.h
  2. 6 2
      core/vector/VectorT.tcc

+ 1 - 1
core/basics/numerictools.h

@@ -446,7 +446,7 @@ std::string intToString(const int i);
  * @param length - resulting length of string including leading zeros
  * @return string
  */
-std::string intToString(const int i, const uint & length);
+std::string intToString(const int i, const unsigned int & length);
 
 /**
  * Convert a double into a string.

+ 6 - 2
core/vector/VectorT.tcc

@@ -756,10 +756,14 @@ void VectorT<ElementType>::sortDescend(VectorT<int> & permutation) {
   permutation.resize(this->size());
 
   int idxSelf ( 0 );
-  for (VectorT<ElementType>::const_iterator itSelf = (*this).begin(); itSelf != (*this).end(); itSelf++, idxSelf++)
+  for (typename VectorT<ElementType>::const_iterator itSelf = (*this).begin(); 
+       itSelf != (*this).end(); 
+       itSelf++, idxSelf++)
   {
     int idxOrig ( 0 );
-    for ( VectorT<ElementType>::const_iterator itOrig = tmp_cp.begin(); itOrig != tmp_cp.end(); itOrig++, idxOrig++)
+    for (typename VectorT<ElementType>::const_iterator itOrig = tmp_cp.begin(); 
+         itOrig != tmp_cp.end(); 
+         itOrig++, idxOrig++)
     {
       if ( *itOrig == *itSelf )
       {