[QGIS Commit] r9655 - trunk/qgis/src/providers/grass

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-11-17 11:29:34 -0500 (Mon, 17 Nov 2008)
New Revision: 9655

Modified:
   trunk/qgis/src/providers/grass/qgsgrassprovider.cpp
Log:
apply patch #364 from GRASS TRAC by Markus Neteler

Modified: trunk/qgis/src/providers/grass/qgsgrassprovider.cpp
===================================================================
--- trunk/qgis/src/providers/grass/qgsgrassprovider.cpp	2008-11-17 16:11:11 UTC (rev 9654)
+++ trunk/qgis/src/providers/grass/qgsgrassprovider.cpp	2008-11-17 16:29:34 UTC (rev 9655)
@@ -1040,7 +1040,11 @@
   if ( level == 1 )
   {
     QgsGrass::resetError();
-    Vect_build( map.map, stderr );
+#if GRASS_VERSION_MAJOR >= 6 && GRASS_VERSION_MINOR >= 4 
+    Vect_build( map.map );
+#else
+    Vect_build( map.map, stderr ); 
+#endif
 
     if ( QgsGrass::getError() == QgsGrass::FATAL )
     {
@@ -1520,7 +1524,11 @@
   G__setenv(( char * ) "MAPSET", map->mapset.toAscii().data() );
 
   Vect_build_partial( map->map, GV_BUILD_NONE, NULL );
+#if GRASS_VERSION_MAJOR >= 6 && GRASS_VERSION_MINOR >= 4 
+  Vect_build( map.map ); 
+#else 
   Vect_build( map->map, stderr );
+#endif
 
   // If a new map was created close the map and return
   if ( newMap )