Bjoern Froehlich 12 anni fa
parent
commit
acf986596f
2 ha cambiato i file con 13 aggiunte e 4 eliminazioni
  1. 4 4
      core/vector/SparseVectorT.tcc
  2. 9 0
      templates/Makefile.config.template

+ 4 - 4
core/vector/SparseVectorT.tcc

@@ -93,7 +93,7 @@ void SparseVectorT<I,V>::divide ( const SparseVectorT<I,V> & v )
     }
 
     if ( deleteEntry )
-      erase ( it++ );
+      this->erase ( it++ );
     else
       it++;
   }
@@ -114,7 +114,7 @@ void SparseVectorT<I,V>::divide ( V v )
       deleteEntry = true;
 
     if ( deleteEntry )
-      erase ( it++ );
+      this->erase ( it++ );
     else
       it++;
   }
@@ -137,7 +137,7 @@ void SparseVectorT<I,V>::multiply ( const SparseVectorT<I,V> & v )
     }
 
     if ( deleteEntry )
-      erase ( it++ );
+      this->erase ( it++ );
     else
       it++;
   }
@@ -151,7 +151,7 @@ void SparseVectorT<I,V>::multiply ( V val )
     it->second *= val;
     if ( fabs ( it->second ) < 1e-20 )
     {
-      erase ( it++ );
+      this->erase ( it++ );
     } else {
       it++;
     }

+ 9 - 0
templates/Makefile.config.template

@@ -176,6 +176,15 @@ else
   endif
 endif
 
+ifeq (1,$(shell pkg-config --exists $(QT4_PKGCONFIG) && echo "1"))
+  QT4_CFLAGS=-DQT3_SUPPORT -DNICE_USELIB_QT
+  # The moc precompiler. Make sure it´s the Qt4 version!
+  MOC=$(MOC_BINARY) $(QT4_CFLAGS)
+else
+  QT4_PKGCONFIG=
+  $(call CONFIGINFO,QT4,0)
+endif
+
 #QT4_XML
 ifeq (1,$(shell pkg-config --exists $(QT4_XML_PKGCONFIG) && echo "1"))
   QT4_XML_CFLAGS="-DNICE_USELIB_QT4_XML"