Ported r6894 to 0.8 branch (workaround for G_set_error_routine)

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6932 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 6, 2007 · e73403d · e73403d
1 parent 9f1b42c
commit e73403d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -348,6 +348,10 @@ QString QgsGrass::mGisrc;
 QString QgsGrass::mTmp;
 
 int QgsGrass::error_routine ( char *msg, int fatal) {
+  return error_routine((const char*) msg, fatal);
+}
+
+int QgsGrass::error_routine ( const char *msg, int fatal) {
     std::cerr << "error_routine (fatal = " << fatal << "): " << msg << std::endl;
 
     if ( fatal ) error = FATAL;

diff --git a/src/providers/grass/qgsgrass.h b/src/providers/grass/qgsgrass.h
@@ -163,6 +163,11 @@ class QgsGrass {
     static GERROR error;         // static, because used in constructor
     static QString error_message;
 
+    // G_set_error_routine has two versions of the function's first argument it expects:
+    // - char* msg - older version
+    // - const char* msg - in CVS from 04/2007
+    // this way compiler chooses suitable call
+    static int error_routine ( const char *msg, int fatal); // static because pointer to this function is set later
     static int error_routine ( char *msg, int fatal); // static because pointer to this function is set later
 
     // Current mapset lock file path