Commit 42f4c4b5 authored by Francois Keith's avatar Francois Keith
Browse files

Ignore depracation warning in WIN32, prevent additional warning due to unknown #pragma

parent be89af3b
Pipeline #12629 passed with stage
in 149 minutes and 26 seconds
......@@ -40,10 +40,19 @@ namespace pinocchio
if (joint>0) geom_data.oMg[i] = (data.oMi[joint] * geom_model.geometryObjects[i].placement);
else geom_data.oMg[i] = geom_model.geometryObjects[i].placement;
#ifdef PINOCCHIO_WITH_HPP_FCL
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined (WIN32)
#pragma warning(push)
#pragma warning(disable : 4996)
#endif // __GNUC__
geom_data.collisionObjects[i].setTransform( toFclTransform3f(geom_data.oMg[i]) );
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined (WIN32)
#pragma warning(pop)
#endif // __GNUC__
#endif // PINOCCHIO_WITH_HPP_FCL
}
}
......
......@@ -124,8 +124,13 @@ struct GeometryObject
/// \brief Absolute path to the mesh texture file.
std::string meshTexturePath;
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined (WIN32)
#pragma warning(push)
#pragma warning(disable : 4996)
#endif //__GNUC__
///
/// \brief Full constructor.
///
......@@ -162,10 +167,19 @@ struct GeometryObject
, meshColor(meshColor)
, meshTexturePath(meshTexturePath)
{}
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined (WIN32)
#pragma warning(pop)
#endif //__GNUC__
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined (WIN32)
#pragma warning(push)
#pragma warning(disable : 4996)
#endif //__GNUC__
///
/// \brief Reduced constructor.
/// \remarks Compared to the other constructor, this one assumes that there is no parentFrame associated to the geometry.
......@@ -201,16 +215,29 @@ struct GeometryObject
, meshColor(meshColor)
, meshTexturePath(meshTexturePath)
{}
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined (WIN32)
#pragma warning(pop)
#endif //__GNUC__
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined (WIN32)
#pragma warning(push)
#pragma warning(disable : 4996)
#endif //__GNUC__
GeometryObject(const GeometryObject & other)
: fcl(geometry)
{
*this = other;
}
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined (WIN32)
#pragma warning(pop)
#endif //__GNUC__
GeometryObject & operator=(const GeometryObject & other)
{
......
......@@ -19,8 +19,13 @@
namespace pinocchio
{
// Avoid deprecated warning of collisionObjects
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined (WIN32)
#pragma warning(push)
#pragma warning(disable : 4996)
#endif //__GNUC__
inline GeometryData::GeometryData(const GeometryModel & geom_model)
: oMg(geom_model.ngeoms)
, activeCollisionPairs(geom_model.collisionPairs.size(), true)
......@@ -76,7 +81,11 @@ namespace pinocchio
{}
inline GeometryData::~GeometryData() {}
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined (WIN32)
#pragma warning(pop)
#endif //__GNUC__
template<typename S2, int O2, template<typename,int> class JointCollectionTpl>
GeomIndex GeometryModel::addGeometryObject(const GeometryObject & object,
......
......@@ -60,10 +60,19 @@ namespace pinocchio
typedef Symmetric3Tpl <double,0> Symmetric3;
typedef MotionZeroTpl <double,0> MotionZero;
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined (WIN32)
#pragma warning(push)
#pragma warning(disable : 4996)
#endif //__GNUC__
typedef BiasZeroTpl <double,0> BiasZero;
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined (WIN32)
#pragma warning(pop)
#endif //__GNUC__
/**
* @}
......
......@@ -125,8 +125,13 @@ namespace pinocchio
BiasZeroTpl(const Base &) {}
};
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined (WIN32)
#pragma warning(push)
#pragma warning(disable : 4996)
#endif //__GNUC__
template<typename Scalar, int Options>
struct SE3GroupAction< BiasZeroTpl<Scalar,Options> >
{
......@@ -138,7 +143,11 @@ namespace pinocchio
{
typedef BiasZeroTpl<Scalar,Options> ReturnType;
};
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined (WIN32)
#pragma warning(pop)
#endif //__GNUC__
} // namespace pinocchio
......
Supports Markdown
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