From d0de7c255b7b2339dcfc930344cc037218757a9e Mon Sep 17 00:00:00 2001
From: jcarpent <jcarpent@laas.fr>
Date: Wed, 21 Sep 2016 18:23:33 +0200
Subject: [PATCH] [C++] Fix missing #ifdef WITH_HPP_FCL
---
bindings/python/geometry-data.hpp | 2 ++
src/multibody/geometry.hxx | 2 ++
2 files changed, 4 insertions(+)
diff --git a/bindings/python/geometry-data.hpp b/bindings/python/geometry-data.hpp
index b95ec7573..1510b6139 100644
--- a/bindings/python/geometry-data.hpp
+++ b/bindings/python/geometry-data.hpp
@@ -30,6 +30,7 @@
namespace fcl
{
+#ifdef WITH_HPP_FCL
// This operator is defined here temporary, as it is needed by vector_indexing_suite
// It has also been defined in hpp-fcl in a pending pull request.
// Once it has been integrated in releases of hpp-fcl, please remove this operator
@@ -41,6 +42,7 @@ namespace fcl
&& dr1.nearest_points[0] == dr2.nearest_points[0]
&& dr1.nearest_points[1] == dr2.nearest_points[1];
}
+#endif
}
namespace se3
{
diff --git a/src/multibody/geometry.hxx b/src/multibody/geometry.hxx
index 7e3fba71f..1d706b593 100644
--- a/src/multibody/geometry.hxx
+++ b/src/multibody/geometry.hxx
@@ -130,6 +130,7 @@ namespace se3
// std::cout << "outer object already added" << std::endl;
// }
+#ifdef WITH_HPP_FCL
inline void GeometryData::fillInnerOuterObjectMaps(const GeometryModel & geomModel)
{
innerObjects.clear();
@@ -143,6 +144,7 @@ namespace se3
outerObjects[geomModel.geometryObjects[pair.first].parentJoint].push_back(pair.second);
}
}
+#endif
inline std::ostream & operator<< (std::ostream & os, const GeometryModel & geomModel)
{
--
GitLab