Merge pull request #46 from tmdiv/devel

Fix missing isnan in Visual C++ (relates to #23)
OctoMap · Sep 5, 2013 · e90a56a · e90a56a
2 parents c5d2003 + 45e4305
commit e90a56a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/octomap/src/compare_octrees.cpp b/octomap/src/compare_octrees.cpp
@@ -39,8 +39,13 @@
 #include <list>
 #include <cmath>
 
+#ifdef _MSC_VER
+#define isnan(x) _isnan(x)  //for VC++
+#endif
+
 using std::cout;
 using std::endl;
+using namespace std;
 using namespace octomap;
 
 void printUsage(char* self){
@@ -127,7 +132,7 @@ int main(int argc, char** argv) {
       else
         kld +=log(p1/p2)*p1 + log((1-p1)/(1-p2))*(1-p1);
 
-      if (std::isnan(kld)){
+      if (isnan(kld)){
         OCTOMAP_ERROR("KLD is nan! KLD(%f,%f)=%f; sum = %f", p1, p2, kld, kld_sum);
         exit(-1);
       }