From f03b133698c4b0bfc783a3755d666e615162bb26 Mon Sep 17 00:00:00 2001
From: Rohan Budhiraja <budhiraja@laas.fr>
Date: Thu, 20 Oct 2016 11:57:35 +0200
Subject: [PATCH] [wip/sot-dynamic-pinocchio-v3] change in Pinocchio python
bindings API.
---
sot-dynamic-pinocchio-v3/Makefile | 2 +-
sot-dynamic-pinocchio-v3/distinfo | 1 +
sot-dynamic-pinocchio-v3/patches/patch-ab | 37 +++++++++++++++++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 sot-dynamic-pinocchio-v3/patches/patch-ab
diff --git a/sot-dynamic-pinocchio-v3/Makefile b/sot-dynamic-pinocchio-v3/Makefile
index d2516232..d664fc05 100644
--- a/sot-dynamic-pinocchio-v3/Makefile
+++ b/sot-dynamic-pinocchio-v3/Makefile
@@ -3,7 +3,7 @@
#
VERSION= 3.1.1
-# PKGREVISION= 2
+PKGREVISION= 1
DISTNAME= sot-dynamic-pinocchio-v3-${VERSION}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=sot-dynamic-pinocchio-v3/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}proyan/sot-dynamic/
diff --git a/sot-dynamic-pinocchio-v3/distinfo b/sot-dynamic-pinocchio-v3/distinfo
index 40a65801..c87b770b 100644
--- a/sot-dynamic-pinocchio-v3/distinfo
+++ b/sot-dynamic-pinocchio-v3/distinfo
@@ -2,3 +2,4 @@ SHA1 (sot-dynamic-pinocchio-v3-3.1.1.tar.gz) = e715bffba1a6d2d973243862a6e473ca5
RMD160 (sot-dynamic-pinocchio-v3-3.1.1.tar.gz) = beddcd9fae060cbf371b80075978e200da88a581
Size (sot-dynamic-pinocchio-v3-3.1.1.tar.gz) = 922041 bytes
SHA1 (patch-aa) = c57a914a6fc1140f348dec8c1cd2627c79a4de7d
+SHA1 (patch-ab) = 70878ef8071dfce1eddb895b35e3cdb4942a848f
diff --git a/sot-dynamic-pinocchio-v3/patches/patch-ab b/sot-dynamic-pinocchio-v3/patches/patch-ab
new file mode 100644
index 00000000..7d8e06e1
--- /dev/null
+++ b/sot-dynamic-pinocchio-v3/patches/patch-ab
@@ -0,0 +1,37 @@
+diff --git src/python-module-py.cpp src/python-module-py.cpp
+index 2525ae2..b0ed6d7 100644
+--- src/python-module-py.cpp
++++ src/python-module-py.cpp
+@@ -19,8 +19,8 @@
+ #include <typeinfo>
+ #include <cstdio>
+ #include <pinocchio/bindings/python/multibody/model.hpp>
+-#include <pinocchio/bindings/python/data.hpp>
+-#include <pinocchio/bindings/python/handler.hpp>
++#include <pinocchio/bindings/python/multibody/data.hpp>
++#include <pinocchio/bindings/python/utils/handler.hpp>
+
+
+ namespace dynamicgraph{
+@@ -87,8 +87,8 @@ namespace dynamicgraph{
+ Dynamic* dyn_entity = (Dynamic*) pointer1;
+
+ try {
+- se3::python::ModelHandler cppModelHandle =
+- boost::python::extract<se3::python::ModelHandler>(pyPinocchioObject);
++ se3::python::Handler<se3::Model> cppModelHandle =
++ boost::python::extract< se3::python::Handler<se3::Model> >(pyPinocchioObject);
+ dyn_entity->setModel(cppModelHandle.ptr());
+ //dyn_entity->m_model = cppModelHandle.ptr();
+ }
+@@ -127,8 +127,8 @@ namespace dynamicgraph{
+ Dynamic* dyn_entity = (Dynamic*) pointer1;
+
+ try {
+- se3::python::DataHandler cppDataHandle =
+- boost::python::extract<se3::python::DataHandler>(pyPinocchioObject);
++ se3::python::Handler<se3::Data> cppDataHandle =
++ boost::python::extract< se3::python::Handler<se3::Data> >(pyPinocchioObject);
+ dyn_entity->setData(cppDataHandle.ptr());
+ //dyn_entity->m_data = cppDataHandle.ptr();
+ }
--
GitLab