Skip to content
Snippets Groups Projects
Commit b2c08c01 authored by Séverin Lemaignan's avatar Séverin Lemaignan
Browse files

[wip/mhp-genom] Re-release mhp, including several compilation fixes omitted in previous release

While here, remove old patch that is not relevant anymore.

Compilation tested with options: pr2 spark tcl
parent be970cd4
No related branches found
No related tags found
No related merge requests found
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
# Created: Severin Lemaignan on Tue, 31 Aug 2010 # Created: Severin Lemaignan on Tue, 31 Aug 2010
# #
DISTNAME= mhp-genom-3.11 DISTNAME= mhp-genom-3.11.1
CATEGORIES= path CATEGORIES= path
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=mhp-genom/} MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=mhp-genom/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}mhp-genom MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}mhp-genom
MAINTAINER= easisbot@laas.fr MAINTAINER= robots@laas.fr
COMMENT= Motion in Human Presence module COMMENT= Motion in Human Presence module
#mhp-genom is currently GPL because it depends on BioMove3D that depends itself #mhp-genom is currently GPL because it depends on BioMove3D that depends itself
# on GSL and GLPK that are 2 GLP librairies. # on GSL and GLPK that are 2 GLP librairies.
......
SHA1 (mhp-genom-3.11.tar.gz) = 95bc0fa3f51fc65732ad625f3cd4cdb301af1649 SHA1 (mhp-genom-3.11.1.tar.gz) = 795c63076ecd35f53aa6c05d083c2996eade8355
RMD160 (mhp-genom-3.11.tar.gz) = 74a6a469788df67593a096ad9df01c724bfb7bef RMD160 (mhp-genom-3.11.1.tar.gz) = 785961ee8031d3cf5bc425696a9396b5a396baad
Size (mhp-genom-3.11.tar.gz) = 44575 bytes Size (mhp-genom-3.11.1.tar.gz) = 44597 bytes
diff --git a/codels/mhpManipulationCodels.cc b/codels/mhpManipulationCodels.cc
index d2def26..07fb13c 100644
--- codels/mhpManipulationCodels.cc
+++ codels/mhpManipulationCodels.cc
@@ -687,7 +687,7 @@ mhpArmPlanTaskMain(STRUCT_MHP_ARM_PLAN_PARAMS *armPlanTaskParams, int *report)
}
if(smTrajs[0].convertToSM_TRAJ_STR(&(SDI_F->armTrajArray.traj[indexTraj])) != 0) {
- smTraj[0].clear();
+ smTrajs[0].clear();
smTrajs[0].convertToSM_TRAJ_STR(&(SDI_F->armTrajArray.traj[indexTraj]));
*report = S_mhp_NO_TRAJ_FOUND;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment