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
42f4c4b5
Commit
42f4c4b5
authored
Dec 08, 2020
by
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
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/algorithm/geometry.hxx
View file @
42f4c4b5
...
...
@@ -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
}
}
...
...
src/multibody/fcl.hpp
View file @
42f4c4b5
...
...
@@ -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
)
{
...
...
src/multibody/geometry.hxx
View file @
42f4c4b5
...
...
@@ -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
,
...
...
src/spatial/fwd.hpp
View file @
42f4c4b5
...
...
@@ -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__
/**
* @}
...
...
src/spatial/motion-zero.hpp
View file @
42f4c4b5
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
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