1
0
Fork 0

tg_unique_geod: compile under MSVC

This commit is contained in:
Christian Schmitt 2012-11-22 17:47:37 +01:00
parent bc63d72de5
commit 1f6e6f6f68

View file

@ -1,4 +1,5 @@
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
#include <simgear/math/SGMisc.hxx>
// Implement Unique SGGeod list // Implement Unique SGGeod list
@ -41,8 +42,8 @@ public:
/* only hash lon, lat - we want to detect dups in 2d only */ /* only hash lon, lat - we want to detect dups in 2d only */
unsigned long long raw_pt[2]; unsigned long long raw_pt[2];
raw_pt[0] = (unsigned long long)( round(geod.getLongitudeDeg() * PROXIMITY_MULTIPLIER) ); raw_pt[0] = (unsigned long long)( SGMisc::round(geod.getLongitudeDeg() * PROXIMITY_MULTIPLIER) );
raw_pt[1] = (unsigned long long)( round(geod.getLatitudeDeg() * PROXIMITY_MULTIPLIER) ); raw_pt[1] = (unsigned long long)( SGMisc::round(geod.getLatitudeDeg() * PROXIMITY_MULTIPLIER) );
unsigned char* it = (unsigned char*)raw_pt; unsigned char* it = (unsigned char*)raw_pt;
for ( unsigned i=0; i<sizeof( raw_pt ); i++ ) { for ( unsigned i=0; i<sizeof( raw_pt ); i++ ) {
@ -122,4 +123,4 @@ public:
private: private:
unique_geod_set index_list; unique_geod_set index_list;
std::vector<SGGeod> geod_list; std::vector<SGGeod> geod_list;
}; };