Skip to content
Snippets Groups Projects
Commit dcf2bdec authored by Olivier Stasse's avatar Olivier Stasse
Browse files

[wip/jrl-walkgen-v3] Update to version 4.0.2

Fix missing headers.
Remove c++0 flag.
parent 5f5cb69b
No related branches found
No related tags found
No related merge requests found
......@@ -4,10 +4,10 @@
DISTNAME= jrl-walkgen-v3-${VERSION}
PKGNAME= jrl-walkgen-v3-${VERSION}
VERSION= 4.0.1
VERSION= 4.0.2
CATEGORIES= wip
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=jrl-walkgen-v3/}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}stack-of-tasks/jrl-walkgen/
MAINTAINER= gepetto@laas.fr
......
SHA1 (jrl-walkgen-v3-4.0.1.tar.gz) = d7aeee11b6ae5ab7690515ed48cee1a9598bfbf4
RMD160 (jrl-walkgen-v3-4.0.1.tar.gz) = d9cde5fea97fea17256076ad2a228a44a3ef1e6c
Size (jrl-walkgen-v3-4.0.1.tar.gz) = 15455904 bytes
SHA1 (patch-aa) = 2fbf0817b8a829ee93cd7927d056f5332467d254
SHA1 (patch-ab) = c1ea22904391d7a3ddc3467a5487b9361000186f
SHA1 (jrl-walkgen-v3-4.0.2.tar.gz) = fbe821853a1921e8776b4745d8aa4e0356b6d0ef
RMD160 (jrl-walkgen-v3-4.0.2.tar.gz) = 6e9382a9675e31a822bb09387785d9d26a78186b
Size (jrl-walkgen-v3-4.0.2.tar.gz) = 15995559 bytes
diff --git CMakeLists.txt CMakeLists.txt
index aed2712..c540776 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -36,6 +36,10 @@ SETUP_PROJECT()
# Handle OS specificities
INCLUDE(CheckIncludeFiles)
+
+#For gcc4.5.1 with boost1.55.0 using c++0x
+ADD_DEFINITIONS(-DBOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
+
CHECK_INCLUDE_FILES("sys/time.h" SYS_TIME_H)
IF(SYS_TIME_H)
ADD_DEFINITIONS("-DHAVE_SYS_TIME_H")
diff --git src/RobotDynamics/pinocchiorobot.cpp src/RobotDynamics/pinocchiorobot.cpp
index 951e0b5..78859d8 100644
--- src/RobotDynamics/pinocchiorobot.cpp
+++ src/RobotDynamics/pinocchiorobot.cpp
@@ -102,7 +102,7 @@ bool PinocchioRobot::checkModel(se3::Model * robotModel)
throw std::invalid_argument(exception_message);
return false ;
}
- if(!robotModel->existFrame("BODY"))
+ if(!robotModel->existFrame("BODY") && !robotModel->existFrame("body"))
{
m_boolModel=false;
const std::string exception_message ("BODY is not a valid body name");
@@ -146,7 +146,7 @@ bool PinocchioRobot::initializeRobotModelAndData(se3::Model * robotModel,
// initialize the short cut for the joint ids
se3::FrameIndex chest = m_robotModel->getFrameId("torso");
m_chest = m_robotModel->frames[chest].parent ;
- se3::FrameIndex waist = m_robotModel->getFrameId("BODY");
+ se3::FrameIndex waist = (robotModel->existFrame("BODY"))?m_robotModel->getFrameId("BODY"):m_robotModel->getFrameId("body");
m_waist = m_robotModel->frames[waist].parent ;
se3::FrameIndex ra = m_robotModel->getFrameId("r_ankle");
m_rightFoot.associatedAnkle = m_robotModel->frames[ra].parent ;
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