sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix MSVC warning and stdint.h dependency

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@10128 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-02-08 18:11:02 +00:00
parent 8f1cf6edac
commit def3abcce4
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/spatialindex/include/Tools.h
View File

@ -25,8 +25,10 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <locale> #include <locale>
#include <limits> #include <limits>
#endif//_MSC_VER typedef unsigned __int8 uint8_t;
#else
#include <stdint.h> #include <stdint.h>
#endif//_MSC_VER
#include <assert.h> #include <assert.h>
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>

2
src/core/spatialindex/qgsspatialindex.cpp
View File

@ -113,10 +113,12 @@ bool QgsSpatialIndex::insertFeature( QgsFeature& f )
} }
catch ( Tools::Exception &e ) catch ( Tools::Exception &e )
{ {
Q_UNUSED(e);
QgsDebugMsg( QString( "Tools::Exception caught: " ).arg( e.what().c_str() ) ); QgsDebugMsg( QString( "Tools::Exception caught: " ).arg( e.what().c_str() ) );
} }
catch ( const std::exception &e ) catch ( const std::exception &e )
{ {
Q_UNUSED(e);
QgsDebugMsg( QString( "std::exception caught: " ).arg( e.what() ) ); QgsDebugMsg( QString( "std::exception caught: " ).arg( e.what() ) );
} }
catch ( ... ) catch ( ... )

3
src/core/spatialindex/rtree/RTree.cc
View File

@ -1177,6 +1177,7 @@ long SpatialIndex::RTree::RTree::writeNode( Node* n )
} }
catch ( Tools::InvalidPageException& e ) catch ( Tools::InvalidPageException& e )
{ {
Q_UNUSED(e);
delete[] buffer; delete[] buffer;
QgsDebugMsg( e.what().c_str() ); QgsDebugMsg( e.what().c_str() );
throw Tools::IllegalStateException( "writeNode: failed with Tools::InvalidPageException" ); throw Tools::IllegalStateException( "writeNode: failed with Tools::InvalidPageException" );
@ -1222,6 +1223,7 @@ SpatialIndex::RTree::NodePtr SpatialIndex::RTree::RTree::readNode( unsigned long
} }
catch ( Tools::InvalidPageException& e ) catch ( Tools::InvalidPageException& e )
{ {
Q_UNUSED(e);
QgsDebugMsg( e.what().c_str() ); QgsDebugMsg( e.what().c_str() );
throw Tools::IllegalStateException( "readNode: failed with Tools::InvalidPageException" ); throw Tools::IllegalStateException( "readNode: failed with Tools::InvalidPageException" );
} }
@ -1272,6 +1274,7 @@ void SpatialIndex::RTree::RTree::deleteNode( Node* n )
} }
catch ( Tools::InvalidPageException& e ) catch ( Tools::InvalidPageException& e )
{ {
Q_UNUSED(e);
QgsDebugMsg( e.what().c_str() ); QgsDebugMsg( e.what().c_str() );
throw Tools::IllegalStateException( "deleteNode: failed with Tools::InvalidPageException" ); throw Tools::IllegalStateException( "deleteNode: failed with Tools::InvalidPageException" );
} }