Use eigen_stl_containers instead of defining typedefs

ros-industrial-attic · Feb 15, 2019 · 5e3ce87 · 5e3ce87
1 parent 14c6f42
commit 5e3ce87
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 ## Find catkin macros and libraries
 find_package(catkin REQUIRED COMPONENTS
+  eigen_stl_containers
   roscpp
   rviz_visual_tools
 )
@@ -34,6 +35,7 @@ catkin_package(
   ${PROJECT_NAME}_surfacing
   ${PROJECT_NAME}_tire_machining
   CATKIN_DEPENDS
+  eigen_stl_containers
   roscpp
   rviz_visual_tools
   DEPENDS

diff --git a/include/bezier/bezier_library.hpp b/include/bezier/bezier_library.hpp
@@ -14,6 +14,9 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
+// ROS
+#include <eigen_stl_containers/eigen_stl_vector_container.h>
+
 // VTK
 #include <vtkSmartPointer.h>
 #include <vtkPolyData.h>
@@ -46,21 +49,9 @@
 #pragma GCC diagnostic pop
 #include <pcl/surface/vtk_smoothing/vtk_utils.h>
 #include <pcl/PolygonMesh.h>
-
-// ROS
 #include <rviz_visual_tools/rviz_visual_tools.h>
-
-// Exceptions
 #include "append_bezier_exception.hpp"
 
-/**
- * Because it's missing in Eigen
- */
-namespace EigenSTL
-{
-typedef std::vector<Eigen::Vector4d, Eigen::aligned_allocator<Eigen::Vector4d> > vector_Vector4d;
-}
-
 /**
  * Bezier abstract class
  */

diff --git a/meshes/REAMDE.md b/meshes/REAMDE.md
@@ -1,4 +1 @@
- [![Institut Maupertuis logo](https://avatars1.githubusercontent.com/u/12760694?v=3&s=80)](http://www.institutmaupertuis.fr) Bezier
-===
-
 Contains the meshes generated by the Bezier algorithms, these meshes should not be deleted as long as a node using Bezier is running.
diff --git a/package.xml b/package.xml
@@ -9,6 +9,7 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
+  <depend>eigen_stl_containers</depend>
   <depend>roscpp</depend>
   <depend>rviz_visual_tools</depend>