From 32da71cb7c60c2d16e8566875b4d24578dd0c0c1 Mon Sep 17 00:00:00 2001
From: Pierre Fernbach <pierre.fernbach@laas.fr>
Date: Thu, 24 Aug 2017 11:37:09 +0200
Subject: [PATCH] Use int instead of short for the number of sample in
'addLimb'
---
idl/hpp/corbaserver/rbprm/rbprmbuilder.idl | 2 +-
src/rbprmbuilder.impl.cc | 2 +-
src/rbprmbuilder.impl.hh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/idl/hpp/corbaserver/rbprm/rbprmbuilder.idl b/idl/hpp/corbaserver/rbprm/rbprmbuilder.idl
index e7dd4dd..ced397c 100755
--- a/idl/hpp/corbaserver/rbprm/rbprmbuilder.idl
+++ b/idl/hpp/corbaserver/rbprm/rbprmbuilder.idl
@@ -249,7 +249,7 @@ module hpp
/// \param contactType whether the contact is punctual ("_3_DOF") or surfacic ("_6_DOF")
/// \param disableEffectorCollision whether collision detection should be disabled for the end effector bones
void addLimb(in string id, in string limb, in string effector, in floatSeq offset, in floatSeq normal,
- in double x, in double y, in unsigned short samples, in string heuristicName,
+ in double x, in double y, in unsigned long samples, in string heuristicName,
in double resolution, in string contactType, in double disableEffectorCollision,
in double grasp) raises (Error);
diff --git a/src/rbprmbuilder.impl.cc b/src/rbprmbuilder.impl.cc
index d6f6c1b..3d67263 100755
--- a/src/rbprmbuilder.impl.cc
+++ b/src/rbprmbuilder.impl.cc
@@ -1068,7 +1068,7 @@ namespace hpp {
}
void RbprmBuilder::addLimb(const char* id, const char* limb, const char* effector, const hpp::floatSeq& offset, const hpp::floatSeq& normal, double x, double y,
- unsigned short samples, const char* heuristicName, double resolution, const char *contactType, double disableEffectorCollision, double grasp) throw (hpp::Error)
+ unsigned int samples, const char* heuristicName, double resolution, const char *contactType, double disableEffectorCollision, double grasp) throw (hpp::Error)
{
if(!fullBodyLoaded_)
throw Error ("No full body robot was loaded");
diff --git a/src/rbprmbuilder.impl.hh b/src/rbprmbuilder.impl.hh
index 36a4812..c5745f4 100755
--- a/src/rbprmbuilder.impl.hh
+++ b/src/rbprmbuilder.impl.hh
@@ -239,7 +239,7 @@ namespace hpp {
double octreeNodeId) throw (hpp::Error);
virtual void addLimb(const char* id, const char* limb, const char* effector, const hpp::floatSeq& offset, const hpp::floatSeq& normal, double x, double y,
- unsigned short samples, const char *heuristicName, double resolution, const char *contactType,
+ unsigned int samples, const char *heuristicName, double resolution, const char *contactType,
double disableEffectorCollision, double grasp) throw (hpp::Error);
virtual void addLimbDatabase(const char* databasePath, const char* id, const char* heuristicName, double loadValues,
double disableEffectorCollision, double grasp) throw (hpp::Error);
--
GitLab