Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
pinocchio
Commits
c586b9b9
Unverified
Commit
c586b9b9
authored
Nov 21, 2020
by
Justin Carpentier
Committed by
GitHub
Nov 21, 2020
Browse files
Merge pull request #1348 from jcarpent/topic/boost
Fix missing namespace for Boost < 1.60.0
parents
fc3e9894
fe82fc02
Pipeline
#12370
passed with stage
in 124 minutes and 16 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/multibody/geometry.hxx
View file @
c586b9b9
...
...
@@ -7,8 +7,12 @@
#include
"pinocchio/multibody/model.hpp"
#include
<boost/bind/bind.hpp>
#include
<boost/utility.hpp>
#if BOOST_VERSION / 100 % 1000 >= 60
#include
<boost/bind/bind.hpp>
#include
<boost/utility.hpp>
#else
#include
<boost/bind.hpp>
#endif
/// @cond DEV
...
...
@@ -97,7 +101,9 @@ namespace pinocchio
inline
GeomIndex
GeometryModel
::
getGeometryId
(
const
std
::
string
&
name
)
const
{
#if BOOST_VERSION / 100 % 1000 >= 60
using
namespace
boost
::
placeholders
;
#endif
GeometryObjectVector
::
const_iterator
it
=
std
::
find_if
(
geometryObjects
.
begin
(),
geometryObjects
.
end
(),
...
...
@@ -108,7 +114,9 @@ namespace pinocchio
inline
bool
GeometryModel
::
existGeometryName
(
const
std
::
string
&
name
)
const
{
#if BOOST_VERSION / 100 % 1000 >= 60
using
namespace
boost
::
placeholders
;
#endif
return
std
::
find_if
(
geometryObjects
.
begin
(),
geometryObjects
.
end
(),
boost
::
bind
(
&
GeometryObject
::
name
,
_1
)
==
name
)
!=
geometryObjects
.
end
();
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment