Commit 580b83a1 authored by Joseph Mirabel's avatar Joseph Mirabel
Browse files

[URDF] Fix compilation for C++ 98

parent 00ec0cef
......@@ -80,7 +80,7 @@ namespace pinocchio
/// or ::urdf::parseURDFFile
template<typename Scalar, int Options, template<typename,int> class JointCollectionTpl>
ModelTpl<Scalar,Options,JointCollectionTpl> &
buildModel(const boost::shared_ptr<::urdf::ModelInterface> urdfTree,
buildModel(const boost::shared_ptr< ::urdf::ModelInterface> urdfTree,
const typename ModelTpl<Scalar,Options,JointCollectionTpl>::JointModel & rootJoint,
ModelTpl<Scalar,Options,JointCollectionTpl> & model,
const bool verbose = false);
......@@ -97,23 +97,23 @@ namespace pinocchio
/// or ::urdf::parseURDFFile
template<typename Scalar, int Options, template<typename,int> class JointCollectionTpl>
ModelTpl<Scalar,Options,JointCollectionTpl> &
buildModel(const boost::shared_ptr<::urdf::ModelInterface> urdfTree,
buildModel(const boost::shared_ptr< ::urdf::ModelInterface> urdfTree,
ModelTpl<Scalar,Options,JointCollectionTpl> & model,
const bool verbose = false);
#ifdef PINOCCHIO_WITH_CXX11_SUPPORT
/// copydoc buildModel<Scalar,Options,JointCollectionTpl>(const boost::shared_ptr<::urdf::ModelInterface>, const typename ModelTpl<Scalar,Options,JointCollectionTpl>::JointModel &, ModelTpl<Scalar,Options,JointCollectionTpl> &, const bool verbose)
/// copydoc buildModel<Scalar,Options,JointCollectionTpl>(const boost::shared_ptr< ::urdf::ModelInterface>, const typename ModelTpl<Scalar,Options,JointCollectionTpl>::JointModel &, ModelTpl<Scalar,Options,JointCollectionTpl> &, const bool verbose)
template<typename Scalar, int Options, template<typename,int> class JointCollectionTpl>
ModelTpl<Scalar,Options,JointCollectionTpl> &
buildModel(const std::shared_ptr<::urdf::ModelInterface> urdfTree,
buildModel(const std::shared_ptr< ::urdf::ModelInterface> urdfTree,
const typename ModelTpl<Scalar,Options,JointCollectionTpl>::JointModel & rootJoint,
ModelTpl<Scalar,Options,JointCollectionTpl> & model,
const bool verbose = false);
/// copydoc buildModel<Scalar,Options,JointCollectionTpl>(const boost::shared_ptr<::urdf::ModelInterface>, ModelTpl<Scalar,Options,JointCollectionTpl> &, const bool verbose)
/// copydoc buildModel<Scalar,Options,JointCollectionTpl>(const boost::shared_ptr< ::urdf::ModelInterface>, ModelTpl<Scalar,Options,JointCollectionTpl> &, const bool verbose)
template<typename Scalar, int Options, template<typename,int> class JointCollectionTpl>
ModelTpl<Scalar,Options,JointCollectionTpl> &
buildModel(const std::shared_ptr<::urdf::ModelInterface> urdfTree,
buildModel(const std::shared_ptr< ::urdf::ModelInterface> urdfTree,
ModelTpl<Scalar,Options,JointCollectionTpl> & model,
const bool verbose = false);
#endif
......
......@@ -439,10 +439,10 @@ namespace pinocchio
switch(type)
{
case COLLISION:
addLinkGeometryToGeomModel<::urdf::Collision >(tree, meshLoader, link, visitor, geomModel, package_dirs);
addLinkGeometryToGeomModel< ::urdf::Collision >(tree, meshLoader, link, visitor, geomModel, package_dirs);
break;
case VISUAL:
addLinkGeometryToGeomModel<::urdf::Visual >(tree, meshLoader, link, visitor, geomModel, package_dirs);
addLinkGeometryToGeomModel< ::urdf::Visual >(tree, meshLoader, link, visitor, geomModel, package_dirs);
break;
default:
break;
......
......@@ -421,7 +421,7 @@ namespace pinocchio
template<typename Scalar, int Options, template<typename,int> class JointCollectionTpl>
ModelTpl<Scalar,Options,JointCollectionTpl> &
buildModel(const boost::shared_ptr<::urdf::ModelInterface> urdfTree,
buildModel(const boost::shared_ptr< ::urdf::ModelInterface> urdfTree,
const typename ModelTpl<Scalar,Options,JointCollectionTpl>::JointModel & rootJoint,
ModelTpl<Scalar,Options,JointCollectionTpl> & model,
const bool verbose)
......@@ -435,7 +435,7 @@ namespace pinocchio
template<typename Scalar, int Options, template<typename,int> class JointCollectionTpl>
ModelTpl<Scalar,Options,JointCollectionTpl> &
buildModel(const boost::shared_ptr<::urdf::ModelInterface> urdfTree,
buildModel(const boost::shared_ptr< ::urdf::ModelInterface> urdfTree,
ModelTpl<Scalar,Options,JointCollectionTpl> & model,
const bool verbose)
{
......@@ -449,7 +449,7 @@ namespace pinocchio
#ifdef PINOCCHIO_WITH_CXX11_SUPPORT
template<typename Scalar, int Options, template<typename,int> class JointCollectionTpl>
ModelTpl<Scalar,Options,JointCollectionTpl> &
buildModel(const std::shared_ptr<::urdf::ModelInterface> urdfTree,
buildModel(const std::shared_ptr< ::urdf::ModelInterface> urdfTree,
const typename ModelTpl<Scalar,Options,JointCollectionTpl>::JointModel & rootJoint,
ModelTpl<Scalar,Options,JointCollectionTpl> & model,
const bool verbose)
......@@ -463,7 +463,7 @@ namespace pinocchio
template<typename Scalar, int Options, template<typename,int> class JointCollectionTpl>
ModelTpl<Scalar,Options,JointCollectionTpl> &
buildModel(const std::shared_ptr<::urdf::ModelInterface> urdfTree,
buildModel(const std::shared_ptr< ::urdf::ModelInterface> urdfTree,
ModelTpl<Scalar,Options,JointCollectionTpl> & model,
const bool verbose)
{
......
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