From 8a69489a24da9d235fd11dd7ea3f578efac66479 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Mon, 19 Aug 2019 17:27:59 +0200
Subject: [PATCH] Fix comment + remove some compilation warnings
---
src/narrowphase/narrowphase.cpp | 4 ++--
test/test_fcl_collision.cpp | 4 ++--
test/test_fcl_frontlist.cpp | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/narrowphase/narrowphase.cpp b/src/narrowphase/narrowphase.cpp
index ab80770f..a54333ef 100644
--- a/src/narrowphase/narrowphase.cpp
+++ b/src/narrowphase/narrowphase.cpp
@@ -526,9 +526,9 @@ bool GJKSolver_indep::shapeTriangleInteraction
// +------------+-----+--------+---------+------+----------+-------+------------+----------+
// | | box | sphere | capsule | cone | cylinder | plane | half-space | triangle |
// +------------+-----+--------+---------+------+----------+-------+------------+----------+
-// | box | | | | | | | | |
+// | box | | O | | | | | | |
// +------------+-----+--------+---------+------+----------+-------+------------+----------+
-// | sphere |/////| O | O | | | | | O |
+// | sphere |/////| O | O | | | | | |
// +------------+-----+--------+---------+------+----------+-------+------------+----------+
// | capsule |/////|////////| O | | | | | |
// +------------+-----+--------+---------+------+----------+-------+------------+----------+
diff --git a/test/test_fcl_collision.cpp b/test/test_fcl_collision.cpp
index 6b9f29c9..8a4e28a1 100644
--- a/test/test_fcl_collision.cpp
+++ b/test/test_fcl_collision.cpp
@@ -858,7 +858,7 @@ bool collide_Test2(const Transform3f& tf,
MeshCollisionTraversalNode<BV> node (request);
bool success = initialize <BV> (node, m1, pose1, m2, pose2, local_result);
- assert (success);
+ BOOST_REQUIRE (success);
node.enable_statistics = verbose;
@@ -977,7 +977,7 @@ bool collide_Test_Oriented(const Transform3f& tf,
TraversalNode node (request);
bool success = initialize (node, (const BVHModel<BV>&)m1, pose1,
(const BVHModel<BV>&)m2, pose2, local_result);
- assert (success);
+ BOOST_REQUIRE (success);
node.enable_statistics = verbose;
diff --git a/test/test_fcl_frontlist.cpp b/test/test_fcl_frontlist.cpp
index 36a5c312..02bba694 100644
--- a/test/test_fcl_frontlist.cpp
+++ b/test/test_fcl_frontlist.cpp
@@ -233,7 +233,7 @@ bool collide_front_list_Test(const Transform3f& tf1, const Transform3f& tf2,
MeshCollisionTraversalNode<BV> node (request);
bool success = initialize <BV>(node, m1, pose1, m2, pose2, local_result);
- assert (success);
+ BOOST_REQUIRE (success);
node.enable_statistics = verbose;
@@ -297,7 +297,7 @@ bool collide_front_list_Test_Oriented(const Transform3f& tf1, const Transform3f&
bool success = initialize (node, (const BVHModel<BV>&)m1, pose1,
(const BVHModel<BV>&)m2, pose2, local_result);
- assert (success);
+ BOOST_REQUIRE (success);
node.enable_statistics = verbose;
@@ -310,7 +310,7 @@ bool collide_front_list_Test_Oriented(const Transform3f& tf1, const Transform3f&
pose1 = tf2;
success = initialize (node, (const BVHModel<BV>&)m1, pose1,
(const BVHModel<BV>&)m2, pose2, local_result);
- assert (success);
+ BOOST_REQUIRE (success);
local_result.clear();
collide(&node, request, local_result, &front_list);
@@ -347,7 +347,7 @@ bool collide_Test(const Transform3f& tf,
MeshCollisionTraversalNode<BV> node (request);
bool success = initialize <BV>(node, m1, pose1, m2, pose2, local_result);
- assert (success);
+ BOOST_REQUIRE (success);
node.enable_statistics = verbose;
--
GitLab