Unverified Commit 79aba69b authored by Joseph Mirabel's avatar Joseph Mirabel Committed by GitHub
Browse files

Merge pull request #217 from jcarpent/devel

Update cmake submodule
parents 87ad1dc9 9008dc66
Pipeline #13960 passed with stage
in 132 minutes and 11 seconds
Subproject commit 002cd0ff517ec4a31fabe6ec7fba759ada99ea51 Subproject commit f4997a81cebfa2dfb69733bc088c55688965dfe8
...@@ -147,6 +147,9 @@ protected: ...@@ -147,6 +147,9 @@ protected:
virtual std::size_t run(const Transform3f& tf1, const Transform3f& tf2, virtual std::size_t run(const Transform3f& tf1, const Transform3f& tf2,
const CollisionRequest& request, CollisionResult& result) const; const CollisionRequest& request, CollisionResult& result) const;
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
}; };
......
...@@ -139,6 +139,9 @@ protected: ...@@ -139,6 +139,9 @@ protected:
virtual FCL_REAL run(const Transform3f& tf1, const Transform3f& tf2, virtual FCL_REAL run(const Transform3f& tf1, const Transform3f& tf2,
const DistanceRequest& request, DistanceResult& result) const; const DistanceRequest& request, DistanceResult& result) const;
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
}; };
......
...@@ -365,6 +365,10 @@ namespace fcl ...@@ -365,6 +365,10 @@ namespace fcl
/// @brief Distance above which the GJK solver stoppes its computations and processes to an early stopping. /// @brief Distance above which the GJK solver stoppes its computations and processes to an early stopping.
/// The two witness points are incorrect, but with the guaranty that the two shapes have a distance greather than distance_upper_bound. /// The two witness points are incorrect, but with the guaranty that the two shapes have a distance greather than distance_upper_bound.
mutable FCL_REAL distance_upper_bound; mutable FCL_REAL distance_upper_bound;
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
}; };
template<> template<>
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="2"> <package format="2">
<name>hpp-fcl</name> <name>hpp-fcl</name>
<version>1.7.0</version> <version>1.7.1</version>
<description>An extension of the Flexible Collision Library.</description> <description>An extension of the Flexible Collision Library.</description>
<!-- The maintainer listed here is for the ROS release to receive emails for the buildfarm. <!-- The maintainer listed here is for the ROS release to receive emails for the buildfarm.
Please check the repository URL for full list of authors and maintainers. --> Please check the repository URL for full list of authors and maintainers. -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment