Unverified Commit c586b9b9 authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub
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
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment