Skip to content

Commit

Permalink
fix MSVC warning and stdint.h dependency
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@10128 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Feb 8, 2009
1 parent 8f1cf6e commit def3abc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/core/spatialindex/include/Tools.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
#ifdef _MSC_VER
#include <locale>
#include <limits>
#endif//_MSC_VER
typedef unsigned __int8 uint8_t;
#else
#include <stdint.h>
#endif//_MSC_VER
#include <assert.h>
#include <iostream>
#include <iomanip>
Expand Down
2 changes: 2 additions & 0 deletions src/core/spatialindex/qgsspatialindex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,12 @@ bool QgsSpatialIndex::insertFeature( QgsFeature& f )
}
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 ( ... )
Expand Down
3 changes: 3 additions & 0 deletions src/core/spatialindex/rtree/RTree.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,7 @@ long SpatialIndex::RTree::RTree::writeNode( Node* n )
}
catch ( Tools::InvalidPageException& e )
{
Q_UNUSED(e);
delete[] buffer;
QgsDebugMsg( e.what().c_str() );
throw Tools::IllegalStateException( "writeNode: failed with Tools::InvalidPageException" );
Expand Down Expand Up @@ -1222,6 +1223,7 @@ SpatialIndex::RTree::NodePtr SpatialIndex::RTree::RTree::readNode( unsigned long
}
catch ( Tools::InvalidPageException& e )
{
Q_UNUSED(e);
QgsDebugMsg( e.what().c_str() );
throw Tools::IllegalStateException( "readNode: failed with Tools::InvalidPageException" );
}
Expand Down Expand Up @@ -1272,6 +1274,7 @@ void SpatialIndex::RTree::RTree::deleteNode( Node* n )
}
catch ( Tools::InvalidPageException& e )
{
Q_UNUSED(e);
QgsDebugMsg( e.what().c_str() );
throw Tools::IllegalStateException( "deleteNode: failed with Tools::InvalidPageException" );
}
Expand Down

0 comments on commit def3abc

Please sign in to comment.