From be0ff2258cf0ec71e442518845185ec0ad49a6d4 Mon Sep 17 00:00:00 2001
From: Christian Schmitt <chris@ilovelinux.de>
Date: Sat, 24 Nov 2012 23:04:17 +0100
Subject: [PATCH] tg_unique_*: make MSVC happy with the rounding

---
 src/Lib/Polygon/tg_unique_vec2f.hxx | 7 ++++---
 src/Lib/Polygon/tg_unique_vec3d.hxx | 9 +++++----
 src/Lib/Polygon/tg_unique_vec3f.hxx | 9 +++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Lib/Polygon/tg_unique_vec2f.hxx b/src/Lib/Polygon/tg_unique_vec2f.hxx
index 4159a1d1..3e9f14f3 100644
--- a/src/Lib/Polygon/tg_unique_vec2f.hxx
+++ b/src/Lib/Polygon/tg_unique_vec2f.hxx
@@ -1,4 +1,5 @@
 #include <boost/unordered_set.hpp>
+#include <simgear/math/SGMisc.hxx>
 
 // Implement Unique SGVec2f list
 
@@ -41,8 +42,8 @@ public:
 
         /* only hash lon, lat - we want to detect dups in 2d only */
         unsigned long long raw_pt[2];
-        raw_pt[0] = (unsigned long long)( round(vec.x() * PROXIMITY_MULTIPLIER) );
-        raw_pt[1] = (unsigned long long)( round(vec.y() * PROXIMITY_MULTIPLIER) );
+        raw_pt[0] = (unsigned long long)( SGMisc<float>::round(vec.x() * PROXIMITY_MULTIPLIER) );
+        raw_pt[1] = (unsigned long long)( SGMisc<float>::round(vec.y() * PROXIMITY_MULTIPLIER) );
 
         unsigned char* it = (unsigned char*)raw_pt;
         for ( unsigned i=0; i<sizeof( raw_pt ); i++ ) {
@@ -124,4 +125,4 @@ int UniqueSGVec2fSet::find( const SGVec2f& v ) const {
     }
 
     return index;
-}
\ No newline at end of file
+}
diff --git a/src/Lib/Polygon/tg_unique_vec3d.hxx b/src/Lib/Polygon/tg_unique_vec3d.hxx
index a94e4084..0b1bbd84 100644
--- a/src/Lib/Polygon/tg_unique_vec3d.hxx
+++ b/src/Lib/Polygon/tg_unique_vec3d.hxx
@@ -1,4 +1,5 @@
 #include <boost/unordered_set.hpp>
+#include <simgear/math/SGMisc.hxx>
 
 // Implement Unique SGVec3d list
 
@@ -41,9 +42,9 @@ public:
 
         /* only hash lon, lat - we want to detect dups in 2d only */
         unsigned long long raw_pt[3];
-        raw_pt[0] = (unsigned long long)( round(vec.x() * PROXIMITY_MULTIPLIER) );
-        raw_pt[1] = (unsigned long long)( round(vec.y() * PROXIMITY_MULTIPLIER) );
-        raw_pt[2] = (unsigned long long)( round(vec.z() * PROXIMITY_MULTIPLIER) );
+        raw_pt[0] = (unsigned long long)( SGMisc<double>::round(vec.x() * PROXIMITY_MULTIPLIER) );
+        raw_pt[1] = (unsigned long long)( SGMisc<double>::round(vec.y() * PROXIMITY_MULTIPLIER) );
+        raw_pt[2] = (unsigned long long)( SGMisc<double>::round(vec.z() * PROXIMITY_MULTIPLIER) );
 
         unsigned char* it = (unsigned char*)raw_pt;
         for ( unsigned i=0; i<sizeof( raw_pt ); i++ ) {
@@ -126,4 +127,4 @@ int UniqueSGVec3dSet::find( const SGVec3d& v ) const {
     }
 
     return index;
-}
\ No newline at end of file
+}
diff --git a/src/Lib/Polygon/tg_unique_vec3f.hxx b/src/Lib/Polygon/tg_unique_vec3f.hxx
index 66d2c0b7..ab67ed09 100644
--- a/src/Lib/Polygon/tg_unique_vec3f.hxx
+++ b/src/Lib/Polygon/tg_unique_vec3f.hxx
@@ -1,4 +1,5 @@
 #include <boost/unordered_set.hpp>
+#include <simgear/math/SGMisc.hxx>
 
 // Implement Unique SGVec3f list
 
@@ -41,9 +42,9 @@ public:
 
         /* only hash lon, lat - we want to detect dups in 2d only */
         unsigned long long raw_pt[3];
-        raw_pt[0] = (unsigned long long)( round(vec.x() * PROXIMITY_MULTIPLIER) );
-        raw_pt[1] = (unsigned long long)( round(vec.y() * PROXIMITY_MULTIPLIER) );
-        raw_pt[2] = (unsigned long long)( round(vec.z() * PROXIMITY_MULTIPLIER) );
+        raw_pt[0] = (unsigned long long)( SGMisc<float>::round(vec.x() * PROXIMITY_MULTIPLIER) );
+        raw_pt[1] = (unsigned long long)( SGMisc<float>::round(vec.y() * PROXIMITY_MULTIPLIER) );
+        raw_pt[2] = (unsigned long long)( SGMisc<float>::round(vec.z() * PROXIMITY_MULTIPLIER) );
 
         unsigned char* it = (unsigned char*)raw_pt;
         for ( unsigned i=0; i<sizeof( raw_pt ); i++ ) {
@@ -126,4 +127,4 @@ int UniqueSGVec3fSet::find( const SGVec3f& v ) const {
     }
 
     return index;
-}
\ No newline at end of file
+}