From 963c17caeda778a2cab39747b9ea7b7986d7a2ba Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Thu, 8 Apr 2021 13:37:08 +0200 Subject: [PATCH] [wip/py-hpp-rbprm] Update patch-88 --- py-hpp-rbprm/Makefile | 2 +- py-hpp-rbprm/distinfo | 2 +- py-hpp-rbprm/patches/patch-88 | 28 +++++++++++++--------------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/py-hpp-rbprm/Makefile b/py-hpp-rbprm/Makefile index efc1b89f..7798f0c8 100644 --- a/py-hpp-rbprm/Makefile +++ b/py-hpp-rbprm/Makefile @@ -5,7 +5,7 @@ HPP_PACKAGE= hpp-rbprm HPP_COMMENT= RB-PRM planner in HPP HPP_VERSION= 4.10.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= wip diff --git a/py-hpp-rbprm/distinfo b/py-hpp-rbprm/distinfo index 78122e2a..10fb1c5d 100644 --- a/py-hpp-rbprm/distinfo +++ b/py-hpp-rbprm/distinfo @@ -2,4 +2,4 @@ SHA1 (hpp-rbprm-4.10.1.tar.gz) = 776424323331448bcd7a3d41d1a9a78959334037 RMD160 (hpp-rbprm-4.10.1.tar.gz) = 59c934f62b85e121be026f6d7558452e168e1489 Size (hpp-rbprm-4.10.1.tar.gz) = 1269777 bytes SHA1 (patch-84) = 0c9994248d9fd6ce110a17936cb1790962fedcf7 -SHA1 (patch-88) = 8ce4ed12dde3f438e8a7700fa59f2ac93fac435f +SHA1 (patch-88) = 375c9ccf7d32715ee932510f41fad72aa43b15dc diff --git a/py-hpp-rbprm/patches/patch-88 b/py-hpp-rbprm/patches/patch-88 index ca4a6cc7..50646987 100644 --- a/py-hpp-rbprm/patches/patch-88 +++ b/py-hpp-rbprm/patches/patch-88 @@ -1,4 +1,4 @@ -From 8f4c44a719691c30520abff3b1e835a1992b2aac Mon Sep 17 00:00:00 2001 +From 008f89cffa31a2bab640f2be8db42fbc3f322833 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Wed, 7 Apr 2021 12:51:54 +0200 Subject: [PATCH] fix boost bind placeholders @@ -14,26 +14,24 @@ is deprecated. Please use <boost/bind/bind.hpp> + using namespace boost::placeholders, or define BOOST_BIND_GLOBAL_PLACEHOLDERS to retain the current behavior. » --- - tests/tools-obstacle.hh | 2 ++ - 1 file changed, 2 insertions(+) + tests/tools-obstacle.hh | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/tests/tools-obstacle.hh b/tests/tools-obstacle.hh -index 5e4ab6b..1702375 100644 +index 5e4ab6b..7c98d09 100644 --- tests/tools-obstacle.hh +++ tests/tools-obstacle.hh -@@ -21,6 +21,7 @@ - #define TOOLSOBSTACLE_HH +@@ -38,6 +38,13 @@ + #include <hpp/rbprm/planner/oriented-path-optimizer.hh> + #include <hpp/rbprm/dynamic/dynamic-path-validation.hh> - #include <pinocchio/parsers/urdf.hpp> ++#if BOOST_VERSION / 100 % 1000 >= 60 +#include <boost/bind/bind.hpp> - #include <hpp/pinocchio/urdf/util.hh> - #include <hpp/pinocchio/device.hh> - #include <hpp/pinocchio/fwd.hh> -@@ -40,6 +41,7 @@ - ++using namespace boost::placeholders; ++#else ++#include <boost/bind.hpp> ++#endif ++ using namespace hpp; using namespace hpp::core; -+using namespace boost::placeholders; - void addAffObjects(hpp::core::ProblemSolver& problemSolver, const affordance::OperationBases_t& ops, - const std::vector<affordance::CollisionObjects_t>& affObjs, -- GitLab