Skip to content

Commit 1bcc2b7

Browse files
committed
core: fix return type issue with Eigen >= 3.4.90
1 parent 40f7101 commit 1bcc2b7

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

include/pinocchio/multibody/joint/joint-revolute.hpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,17 @@ namespace pinocchio
8080
typedef Matrix3 AngularType;
8181
typedef Matrix3 AngularRef;
8282
typedef Matrix3 ConstAngularRef;
83+
#if EIGEN_VERSION_AT_LEAST(3, 4, 90)
84+
typedef typename Vector3::ZeroReturnType LinearType;
85+
typedef const typename Vector3::ZeroReturnType ConstLinearType;
86+
typedef typename Vector3::ZeroReturnType LinearRef;
87+
typedef const typename Vector3::ZeroReturnType ConstLinearRef;
88+
#else
8389
typedef typename Vector3::ConstantReturnType LinearType;
90+
typedef const typename Vector3::ConstantReturnType ConstLinearType;
8491
typedef typename Vector3::ConstantReturnType LinearRef;
8592
typedef const typename Vector3::ConstantReturnType ConstLinearRef;
93+
#endif
8694
typedef typename traits<PlainType>::ActionMatrixType ActionMatrixType;
8795
typedef typename traits<PlainType>::HomogeneousMatrixType HomogeneousMatrixType;
8896
}; // traits TransformRevoluteTpl
@@ -98,6 +106,7 @@ namespace pinocchio
98106
{
99107
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
100108
PINOCCHIO_SE3_TYPEDEF_TPL(TransformRevoluteTpl);
109+
typedef typename traits<TransformRevoluteTpl>::ConstLinearType ConstLinearType;
101110

102111
TransformRevoluteTpl()
103112
{
@@ -180,9 +189,9 @@ namespace pinocchio
180189
m_cos = cos;
181190
}
182191

183-
LinearType translation() const
192+
ConstLinearType translation() const
184193
{
185-
return LinearType::PlainObject::Zero(3);
194+
return ConstLinearType::PlainObject::Zero(3);
186195
}
187196
AngularType rotation() const
188197
{

0 commit comments

Comments
 (0)