From 5ef010b2e1a099e2bcd8bb7dc436e92056f5d025 Mon Sep 17 00:00:00 2001
From: Lucile Remigy <lucile.remigy@epitech.eu>
Date: Tue, 12 Nov 2019 14:54:39 +0100
Subject: [PATCH] modif, encapsulate octree
---
src/traits_traversal.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/traits_traversal.h b/src/traits_traversal.h
index 05025a3d..c296ac8f 100644
--- a/src/traits_traversal.h
+++ b/src/traits_traversal.h
@@ -18,8 +18,6 @@ namespace hpp
namespace fcl
{
-#ifdef HPP_FCL_HAVE_OCTOMAP
-
// TraversalTraitsCollision for collision_func_matrix.cpp
template <typename TypeA, typename TypeB>
@@ -27,6 +25,8 @@ struct TraversalTraitsCollision
{
};
+#ifdef HPP_FCL_HAVE_OCTOMAP
+
template <typename T_SH>
struct TraversalTraitsCollision <T_SH, OcTree>
{
@@ -57,6 +57,8 @@ struct TraversalTraitsCollision <BVHModel<T_BVH>, OcTree>
typedef MeshOcTreeCollisionTraversalNode<T_BVH> CollisionTraversal_t;
};
+#endif
+
// TraversalTraitsDistance for distance_func_matrix.cpp
template <typename TypeA, typename TypeB>
@@ -64,6 +66,8 @@ struct TraversalTraitsDistance
{
};
+#ifdef HPP_FCL_HAVE_OCTOMAP
+
template <typename T_SH>
struct TraversalTraitsDistance <T_SH, OcTree>
{
--
GitLab