[MOAB-dev] r1455 - in MOAB/trunk: . mhdf/src

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2007-12-07 16:44:56 -0600 (Fri, 07 Dec 2007)
New Revision: 1455

Modified:
   MOAB/trunk/MBAdaptiveKDTree.cpp
   MOAB/trunk/MBGeomUtil.cpp
   MOAB/trunk/MBOrientedBox.cpp
   MOAB/trunk/mhdf/src/status.c
Log:
Prefix some functions with an underscore on Windows

Modified: MOAB/trunk/MBAdaptiveKDTree.cpp
===================================================================
--- MOAB/trunk/MBAdaptiveKDTree.cpp	2007-12-07 22:40:25 UTC (rev 1454)
+++ MOAB/trunk/MBAdaptiveKDTree.cpp	2007-12-07 22:44:56 UTC (rev 1455)
@@ -28,6 +28,10 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef _MSC_VER
+#  define finite(A) _finite(A)
+#endif
+
 MBAdaptiveKDTree::Settings::Settings()
   : maxEntPerLeaf(6), 
     maxTreeDepth(30),

Modified: MOAB/trunk/MBGeomUtil.cpp
===================================================================
--- MOAB/trunk/MBGeomUtil.cpp	2007-12-07 22:40:25 UTC (rev 1454)
+++ MOAB/trunk/MBGeomUtil.cpp	2007-12-07 22:44:56 UTC (rev 1455)
@@ -25,6 +25,10 @@
 #include <algorithm>
 #include <assert.h>
 
+#ifdef _MSC_VER
+#  define finite(A) _finite(A)
+#endif
+
 namespace MBGeomUtil {
 
 bool segment_box_intersect( MBCartVect box_min,

Modified: MOAB/trunk/MBOrientedBox.cpp
===================================================================
--- MOAB/trunk/MBOrientedBox.cpp	2007-12-07 22:40:25 UTC (rev 1454)
+++ MOAB/trunk/MBOrientedBox.cpp	2007-12-07 22:44:56 UTC (rev 1455)
@@ -39,6 +39,10 @@
 #include <ostream>
 #include <assert.h>
 #include <limits>
+
+#ifdef _MSC_VER
+#  define finite(A) _finite(A)
+#endif
  
 std::ostream& operator<<( std::ostream& s, const MBOrientedBox& b )
 {

Modified: MOAB/trunk/mhdf/src/status.c
===================================================================
--- MOAB/trunk/mhdf/src/status.c	2007-12-07 22:40:25 UTC (rev 1454)
+++ MOAB/trunk/mhdf/src/status.c	2007-12-07 22:44:56 UTC (rev 1455)
@@ -19,6 +19,9 @@
 
 #include "status.h"
 
+#ifdef _MSC_VER
+# define vsnprintf(A,B,C,D) _vsnprintf((A),(B),(C),(D))
+#endif
 
 int mhdf_isError( mhdf_Status const* status )
 {