From f1923507deef9a5b3efd55cb48e337fee515b855 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Fri, 10 Jun 2016 19:27:21 +0200
Subject: [PATCH] Fix some compilation warnings
---
include/hpp/fcl/math/tools.h | 3 ---
include/hpp/fcl/narrowphase/narrowphase.h | 12 ++++++------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/include/hpp/fcl/math/tools.h b/include/hpp/fcl/math/tools.h
index 77cbfe62..08e0628d 100644
--- a/include/hpp/fcl/math/tools.h
+++ b/include/hpp/fcl/math/tools.h
@@ -123,9 +123,6 @@ void generateCoordinateSystem(
}
/* ----- Start Matrices ------ */
-template<typename Derived, typename OtherDerived>
-void hat(const Eigen::MatrixBase<Derived>& mat, const Eigen::MatrixBase<OtherDerived>& vec) HPP_FCL_DEPRECATED;
-
template<typename Derived, typename OtherDerived>
void hat(const Eigen::MatrixBase<Derived>& mat, const Eigen::MatrixBase<OtherDerived>& vec)
{
diff --git a/include/hpp/fcl/narrowphase/narrowphase.h b/include/hpp/fcl/narrowphase/narrowphase.h
index 2929408d..ed160f7d 100644
--- a/include/hpp/fcl/narrowphase/narrowphase.h
+++ b/include/hpp/fcl/narrowphase/narrowphase.h
@@ -456,7 +456,7 @@ struct GJKSolver_indep
shape.toshape1 = tf2.getRotation().transpose() * tf1.getRotation();
shape.toshape0 = tf1.inverseTimes(tf2);
- details::GJK gjk(gjk_max_iterations, gjk_tolerance);
+ details::GJK gjk((unsigned int )gjk_max_iterations, gjk_tolerance);
details::GJK::Status gjk_status = gjk.evaluate(shape, -guess);
if(enable_cached_guess) cached_guess = gjk.getGuessFromSimplex();
@@ -505,7 +505,7 @@ struct GJKSolver_indep
shape.toshape1 = tf.getRotation();
shape.toshape0 = inverse(tf);
- details::GJK gjk(gjk_max_iterations, gjk_tolerance);
+ details::GJK gjk((unsigned int )gjk_max_iterations, gjk_tolerance);
details::GJK::Status gjk_status = gjk.evaluate(shape, -guess);
if(enable_cached_guess) cached_guess = gjk.getGuessFromSimplex();
@@ -554,7 +554,7 @@ struct GJKSolver_indep
shape.toshape1 = tf2.getRotation().transpose() * tf1.getRotation();
shape.toshape0 = tf1.inverseTimes(tf2);
- details::GJK gjk(gjk_max_iterations, gjk_tolerance);
+ details::GJK gjk((unsigned int )gjk_max_iterations, gjk_tolerance);
details::GJK::Status gjk_status = gjk.evaluate(shape, -guess);
if(enable_cached_guess) cached_guess = gjk.getGuessFromSimplex();
@@ -601,7 +601,7 @@ struct GJKSolver_indep
shape.toshape1 = tf2.getRotation().transpose() * tf1.getRotation();
shape.toshape0 = tf1.inverseTimes(tf2);
- details::GJK gjk(gjk_max_iterations, gjk_tolerance);
+ details::GJK gjk((unsigned int) gjk_max_iterations, gjk_tolerance);
details::GJK::Status gjk_status = gjk.evaluate(shape, -guess);
if(enable_cached_guess) cached_guess = gjk.getGuessFromSimplex();
@@ -653,7 +653,7 @@ struct GJKSolver_indep
shape.toshape1 = tf.getRotation();
shape.toshape0 = inverse(tf);
- details::GJK gjk(gjk_max_iterations, gjk_tolerance);
+ details::GJK gjk((unsigned int )gjk_max_iterations, gjk_tolerance);
details::GJK::Status gjk_status = gjk.evaluate(shape, -guess);
if(enable_cached_guess) cached_guess = gjk.getGuessFromSimplex();
@@ -703,7 +703,7 @@ struct GJKSolver_indep
shape.toshape1 = tf2.getRotation().transpose() * tf1.getRotation();
shape.toshape0 = tf1.inverseTimes(tf2);
- details::GJK gjk(gjk_max_iterations, gjk_tolerance);
+ details::GJK gjk((unsigned int )gjk_max_iterations, gjk_tolerance);
details::GJK::Status gjk_status = gjk.evaluate(shape, -guess);
if(enable_cached_guess) cached_guess = gjk.getGuessFromSimplex();
--
GitLab