Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
fix MSVC warning and stdint.h dependency
- Loading branch information
|
@@ -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> |
|
|
|
@@ -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 ( ... ) |
|
|
|
@@ -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" ); |
|
@@ -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" ); |
|
|
} |
|
@@ -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" ); |
|
|
} |
|
|