[QGIS Commit] r10129 - in branches/Version-1_0/src/core/spatialindex: . include rtree

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-02-08 13:12:07 -0500 (Sun, 08 Feb 2009)
New Revision: 10129

Modified:
   branches/Version-1_0/src/core/spatialindex/include/Tools.h
   branches/Version-1_0/src/core/spatialindex/qgsspatialindex.cpp
   branches/Version-1_0/src/core/spatialindex/rtree/RTree.cc
Log:
merge r10128 in version 1.0

Modified: branches/Version-1_0/src/core/spatialindex/include/Tools.h
===================================================================
--- branches/Version-1_0/src/core/spatialindex/include/Tools.h	2009-02-08 18:11:02 UTC (rev 10128)
+++ branches/Version-1_0/src/core/spatialindex/include/Tools.h	2009-02-08 18:12:07 UTC (rev 10129)
@@ -25,8 +25,10 @@
 #ifdef _MSC_VER
 #include <locale>
 #include <limits>
+typedef unsigned __int8 uint8_t;
+#else
+#include <stdint.h>
 #endif//_MSC_VER
-#include <stdint.h>
 #include <assert.h>
 #include <iostream>
 #include <iomanip>

Modified: branches/Version-1_0/src/core/spatialindex/qgsspatialindex.cpp
===================================================================
--- branches/Version-1_0/src/core/spatialindex/qgsspatialindex.cpp	2009-02-08 18:11:02 UTC (rev 10128)
+++ branches/Version-1_0/src/core/spatialindex/qgsspatialindex.cpp	2009-02-08 18:12:07 UTC (rev 10129)
@@ -113,10 +113,12 @@
   }
   catch ( Tools::Exception &e )
   {
+    Q_UNUSED(e);
     QgsDebugMsg( QString( "Tools::Exception caught: " ).arg( e.what().c_str() ) );
   }
   catch ( const std::exception &e )
   {
+    Q_UNUSED(e);
     QgsDebugMsg( QString( "std::exception caught: " ).arg( e.what() ) );
   }
   catch ( ... )

Modified: branches/Version-1_0/src/core/spatialindex/rtree/RTree.cc
===================================================================
--- branches/Version-1_0/src/core/spatialindex/rtree/RTree.cc	2009-02-08 18:11:02 UTC (rev 10128)
+++ branches/Version-1_0/src/core/spatialindex/rtree/RTree.cc	2009-02-08 18:12:07 UTC (rev 10129)
@@ -1177,6 +1177,7 @@
   }
   catch ( Tools::InvalidPageException& e )
   {
+    Q_UNUSED(e);
     delete[] buffer;
     QgsDebugMsg( e.what().c_str() );
     throw Tools::IllegalStateException( "writeNode: failed with Tools::InvalidPageException" );
@@ -1222,6 +1223,7 @@
   }
   catch ( Tools::InvalidPageException& e )
   {
+    Q_UNUSED(e);
     QgsDebugMsg( e.what().c_str() );
     throw Tools::IllegalStateException( "readNode: failed with Tools::InvalidPageException" );
   }
@@ -1272,6 +1274,7 @@
   }
   catch ( Tools::InvalidPageException& e )
   {
+    Q_UNUSED(e);
     QgsDebugMsg( e.what().c_str() );
     throw Tools::IllegalStateException( "deleteNode: failed with Tools::InvalidPageException" );
   }