Support moving AllowedCollisionMatrix into tesseract_common namespace

tesseract-robotics · Dec 6, 2021 · 4fbbbee · 4fbbbee
1 parent 7604d42
commit 4fbbbee
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/tesseract_monitoring/src/contact_monitor_node.cpp b/tesseract_monitoring/src/contact_monitor_node.cpp
@@ -34,7 +34,6 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
 
 #include <tesseract_environment/environment.h>
 #include <tesseract_scene_graph/graph.h>
-#include <tesseract_scene_graph/utils.h>
 #include <tesseract_srdf/srdf_model.h>
 #include <tesseract_urdf/urdf_parser.h>
 #include <tesseract_rosutils/utils.h>

diff --git a/tesseract_monitoring/src/environment_monitor.cpp b/tesseract_monitoring/src/environment_monitor.cpp
@@ -41,7 +41,6 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
 
 #include <tesseract_monitoring/environment_monitor.h>
 #include <tesseract_environment/utils.h>
-#include <tesseract_scene_graph/utils.h>
 #include <tesseract_rosutils/utils.h>
 
 namespace tesseract_monitoring

diff --git a/tesseract_rosutils/include/tesseract_rosutils/utils.h b/tesseract_rosutils/include/tesseract_rosutils/utils.h
@@ -186,7 +186,7 @@ tesseract_scene_graph::Joint fromMsg(const tesseract_msgs::Joint& joint_msg);
  * @return True if successful, otherwise false
  */
 bool toMsg(std::vector<tesseract_msgs::AllowedCollisionEntry>& acm_msg,
-           const tesseract_scene_graph::AllowedCollisionMatrix& acm);
+           const tesseract_common::AllowedCollisionMatrix& acm);
 
 void toMsg(tesseract_msgs::SceneGraph& scene_graph_msg, const tesseract_scene_graph::SceneGraph& scene_graph);
 

diff --git a/tesseract_rosutils/src/utils.cpp b/tesseract_rosutils/src/utils.cpp
@@ -1145,7 +1145,7 @@ toMsg(const tesseract_common::CollisionMarginOverrideType& contact_margin_overri
 }
 
 bool toMsg(std::vector<tesseract_msgs::AllowedCollisionEntry>& acm_msg,
-           const tesseract_scene_graph::AllowedCollisionMatrix& acm)
+           const tesseract_common::AllowedCollisionMatrix& acm)
 {
   for (const auto& entry : acm.getAllAllowedCollisions())
   {

diff --git a/tesseract_rviz/src/render_tools/visualization_widget.cpp b/tesseract_rviz/src/render_tools/visualization_widget.cpp
@@ -30,7 +30,7 @@
 #include "tesseract_rviz/render_tools/visualization_widget.h"
 #include "tesseract_rviz/render_tools/joint_widget.h"
 #include "tesseract_rviz/render_tools/link_widget.h"
-#include "tesseract_scene_graph/allowed_collision_matrix.h"
+#include "tesseract_common/allowed_collision_matrix.h"
 
 #include <tesseract_common/macros.h>
 TESSERACT_COMMON_IGNORE_WARNINGS_PUSH