Removed remaining unused ros include.

Added namespace qualifiers for isnan and isinf for the new standard.
stanford-iprl-lab · Jan 16, 2018 · a6aaa92 · a6aaa92
1 parent 3d10b7a
commit a6aaa92
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/source/dbot/builder/rb_sensor_builder.h b/source/dbot/builder/rb_sensor_builder.h
@@ -41,8 +41,6 @@
 #include <dbot/pose/euler_vector.h>
 #include <dbot/rigid_body_renderer.h>
 #include <memory>
-#include <ros/package.h>
-#include <ros/ros.h>
 
 namespace dbot
 {

diff --git a/source/dbot/model/kinect_image_model.h b/source/dbot/model/kinect_image_model.h
@@ -165,7 +165,7 @@ class KinectImageModel
             // compute likelihoods ---------------------------------------------
             for (size_t i = 0; i < size_t(predictions.size()); i++)
             {
-                if (isnan(observations_[intersect_indices[i]]))
+                if (std::isnan(observations_[intersect_indices[i]]))
                 {
                     log_likes[i_state] += log(1.);
                 }

diff --git a/source/dbot/model/kinect_pixel_model.h b/source/dbot/model/kinect_pixel_model.h
@@ -88,7 +88,7 @@ class KinectPixelModel
         Scalar sigma = model_sigma_ + sigma_factor_ * observation * observation;
         if (!occlusion_)
         {
-            if (isinf(prediction_))  // if the prediction_ is infinite we return
+            if (std::isinf(prediction_))  // if the prediction_ is infinite we return
                                      // the limit
                 probability = tail_weight_ / max_depth_;
             else
@@ -100,7 +100,7 @@ class KinectPixelModel
         }
         else
         {
-            if (isinf(prediction_))  // if the prediction_ is infinite we return
+            if (std::isinf(prediction_))  // if the prediction_ is infinite we return
                                      // the limit
             {
                 probability =

diff --git a/source/dbot/pose/rigid_bodies_state.h b/source/dbot/pose/rigid_bodies_state.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <Eigen/Dense>
-
 #include "pose_velocity_vector.h"
 
 namespace dbot

diff --git a/source/dbot/rigid_body_renderer.h b/source/dbot/rigid_body_renderer.h
@@ -13,12 +13,10 @@
 
 #pragma once
 
-#include <vector>
-#include <memory>
-
 #include <Eigen/Dense>
-
 #include <dbot/pose/rigid_bodies_state.h>
+#include <memory>
+#include <vector>
 
 namespace dbot
 {