From 5e3ce874c8d8a8f7e6883047f3ded990f7c3b5b1 Mon Sep 17 00:00:00 2001 From: Victor Lamoine Date: Fri, 15 Feb 2019 09:35:20 +0100 Subject: [PATCH] Use eigen_stl_containers instead of defining typedefs --- CMakeLists.txt | 2 ++ include/bezier/bezier_library.hpp | 15 +++------------ meshes/REAMDE.md | 3 --- package.xml | 1 + 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d609eae..e59a2fe 100644 --- 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 index c28cdd9..e51d015 100644 --- a/include/bezier/bezier_library.hpp +++ b/include/bezier/bezier_library.hpp @@ -14,6 +14,9 @@ #include #include +// ROS +#include + // VTK #include #include @@ -46,21 +49,9 @@ #pragma GCC diagnostic pop #include #include - -// ROS #include - -// Exceptions #include "append_bezier_exception.hpp" -/** - * Because it's missing in Eigen - */ -namespace EigenSTL -{ -typedef std::vector > vector_Vector4d; -} - /** * Bezier abstract class */ diff --git a/meshes/REAMDE.md b/meshes/REAMDE.md index 015ce46..9d25599 100644 --- 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 index f0acc65..18a4773 100644 --- a/package.xml +++ b/package.xml @@ -9,6 +9,7 @@ catkin + eigen_stl_containers roscpp rviz_visual_tools