fixup: comment broken bits

Author: fmessmer

cob_obstacle_distance/include/cob_obstacle_distance/marker_shapes/marker_shapes_impl.hpp

@@ -27,6 +27,15 @@
     typedef fcl::Vector3f FCL_Vec3;
 #endif
 */
+#include <fcl/config.h>
+#if FCL_MINOR_VERSION == 5
+    typedef fcl::Vec3f FCL_Vec3;
+    typedef fcl::Quaternion3f FCL_Quaternion;
+#else
+    typedef fcl::Vector3f FCL_Vec3;
+    typedef fcl::Quaternionf FCL_Quaternion;
+#endif
+
 
 #include "cob_obstacle_distance/marker_shapes/marker_shapes.hpp"
 
@@ -128,14 +137,14 @@ template <typename T>
 FCL_CollisionObject MarkerShape<T>::getCollisionObject() const
 {
     // FIXME
-    // fcl::Transform3f x(fcl::Quaternionf(this->marker_.pose.orientation.w,
+    // fcl::Transform3f x(FCL_Quaternion(this->marker_.pose.orientation.w,
     //                                     this->marker_.pose.orientation.x,
     //                                     this->marker_.pose.orientation.y,
     //                                     this->marker_.pose.orientation.z),
-    //                    fcl::Vector3f(this->marker_.pose.position.x,
+    //                    FCL_Vec3(this->marker_.pose.position.x,
     //                                  this->marker_.pose.position.y,
     //                                  this->marker_.pose.position.z));
-    fcl::Transform3f x(fcl::Quaternionf(this->marker_.pose.orientation.w,
+    fcl::Transform3f x(FCL_Quaternion(this->marker_.pose.orientation.w,
                                         this->marker_.pose.orientation.x,
                                         this->marker_.pose.orientation.y,
                                         this->marker_.pose.orientation.z));

cob_obstacle_distance/src/marker_shapes/marker_shapes_impl.cpp

@@ -166,14 +166,14 @@ inline visualization_msgs::Marker MarkerShape<BVH_RSS_t>::getMarker()
 FCL_CollisionObject MarkerShape<BVH_RSS_t>::getCollisionObject() const
 {
     // FIXME
-    // fcl::Transform3f x(fcl::Quaternionf(this->marker_.pose.orientation.w,
+    // fcl::Transform3f x(FCL_Quaternion(this->marker_.pose.orientation.w,
     //                                     this->marker_.pose.orientation.x,
     //                                     this->marker_.pose.orientation.y,
     //                                     this->marker_.pose.orientation.z),
-    //                    fcl::Vector3f(this->marker_.pose.position.x,
+    //                    FCL_Vec3(this->marker_.pose.position.x,
     //                                  this->marker_.pose.position.y,
     //                                  this->marker_.pose.position.z));
-    fcl::Transform3f x(fcl::Quaternionf(this->marker_.pose.orientation.w,
+    fcl::Transform3f x(FCL_Quaternion(this->marker_.pose.orientation.w,
                                         this->marker_.pose.orientation.x,
                                         this->marker_.pose.orientation.y,
                                         this->marker_.pose.orientation.z));