Skip to content
GitLab
Menu
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
fe82fc02
Verified
Commit
fe82fc02
authored
Nov 21, 2020
by
Justin Carpentier
Browse files
core: fix missing namespace for BOOST < 1.60.0
parent
fc3e9894
Pipeline
#12368
passed with stage
in 146 minutes and 48 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/multibody/geometry.hxx
View file @
fe82fc02
...
@@ -7,8 +7,12 @@
...
@@ -7,8 +7,12 @@
#include "pinocchio/multibody/model.hpp"
#include "pinocchio/multibody/model.hpp"
#include <boost/bind/bind.hpp>
#if BOOST_VERSION / 100 % 1000 >= 60
#include <boost/utility.hpp>
#include <boost/bind/bind.hpp>
#include <boost/utility.hpp>
#else
#include <boost/bind.hpp>
#endif
/// @cond DEV
/// @cond DEV
...
@@ -97,7 +101,9 @@ namespace pinocchio
...
@@ -97,7 +101,9 @@ namespace pinocchio
inline
GeomIndex
GeometryModel
::
getGeometryId
(
const
std
::
string
&
name
)
const
inline
GeomIndex
GeometryModel
::
getGeometryId
(
const
std
::
string
&
name
)
const
{
{
#if BOOST_VERSION / 100 % 1000 >= 60
using
namespace
boost
::
placeholders
;
using
namespace
boost
::
placeholders
;
#endif
GeometryObjectVector
::
const_iterator
it
GeometryObjectVector
::
const_iterator
it
=
std
::
find_if
(
geometryObjects
.
begin
(),
=
std
::
find_if
(
geometryObjects
.
begin
(),
geometryObjects
.
end
(),
geometryObjects
.
end
(),
...
@@ -108,7 +114,9 @@ namespace pinocchio
...
@@ -108,7 +114,9 @@ namespace pinocchio
inline
bool
GeometryModel
::
existGeometryName
(
const
std
::
string
&
name
)
const
inline
bool
GeometryModel
::
existGeometryName
(
const
std
::
string
&
name
)
const
{
{
#if BOOST_VERSION / 100 % 1000 >= 60
using
namespace
boost
::
placeholders
;
using
namespace
boost
::
placeholders
;
#endif
return
std
::
find_if
(
geometryObjects
.
begin
(),
return
std
::
find_if
(
geometryObjects
.
begin
(),
geometryObjects
.
end
(),
geometryObjects
.
end
(),
boost
::
bind
(
&
GeometryObject
::
name
,
_1
)
==
name
)
!=
geometryObjects
.
end
();
boost
::
bind
(
&
GeometryObject
::
name
,
_1
)
==
name
)
!=
geometryObjects
.
end
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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