Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
963c17ca
Commit
963c17ca
authored
3 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[wip/py-hpp-rbprm] Update patch-88
parent
16bd6ba3
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
py-hpp-rbprm/Makefile
+1
-1
1 addition, 1 deletion
py-hpp-rbprm/Makefile
py-hpp-rbprm/distinfo
+1
-1
1 addition, 1 deletion
py-hpp-rbprm/distinfo
py-hpp-rbprm/patches/patch-88
+13
-15
13 additions, 15 deletions
py-hpp-rbprm/patches/patch-88
with
15 additions
and
17 deletions
py-hpp-rbprm/Makefile
+
1
−
1
View file @
963c17ca
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
py-hpp-rbprm/distinfo
+
1
−
1
View file @
963c17ca
...
...
@@ -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
This diff is collapsed.
Click to expand it.
py-hpp-rbprm/patches/patch-88
+
13
−
15
View file @
963c17ca
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>
#i
nclude <pinocchio/parsers/urdf.hpp>
+
#i
f BOOST_VERSION / 100 % 1000 >= 60
+#include <boost/bind/bind.hpp>
#include <hpp/pinocchio/urdf/util.hh>
#include <hpp/pinocchio/device.hh>
#include <
hpp/pinocchio/fw
d.h
h
>
@@ -40,6 +41,7 @@
+using namespace boost::placeholders;
+#else
+
#include <
boost/bin
d.h
pp
>
+#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,
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment