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
1d996aa5
Verified
Commit
1d996aa5
authored
Apr 29, 2021
by
Justin Carpentier
Browse files
core: fix operator!= for JointData types
parent
51840667
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/multibody/joint/joint-data-base.hpp
View file @
1d996aa5
...
...
@@ -120,13 +120,14 @@ namespace pinocchio
return
os
;
}
bool
operator
==
(
const
JointDataBase
<
Derived
>
&
other
)
const
template
<
typename
OtherDerived
>
bool
operator
==
(
const
JointDataBase
<
OtherDerived
>
&
other
)
const
{
return
derived
().
isEqual
(
other
.
derived
());
}
/// \brief Default operator== implementation
bool
isEqual
(
const
JointDataBase
<
Derived
>
&
other
)
const
bool
isEqual
(
const
JointDataBase
&
other
)
const
{
return
S
()
==
other
.
S
()
&&
M
()
==
other
.
M
()
...
...
@@ -138,6 +139,14 @@ namespace pinocchio
;
}
/// \brief Default operator== implementation
template
<
typename
OtherDerived
>
bool
isEqual
(
const
JointDataBase
<
OtherDerived
>
&
/*other*/
)
const
{
return
false
;
;
}
bool
operator
!=
(
const
JointDataBase
<
Derived
>
&
other
)
const
{
return
derived
().
isNotEqual
(
other
.
derived
());
...
...
src/multibody/joint/joint-mimic.hpp
View file @
1d996aa5
//
// Copyright (c) 2019 INRIA
// Copyright (c) 2019
-2021
INRIA
//
#ifndef __pinocchio_joint_mimic_hpp__
#define __pinocchio_joint_mimic_hpp__
#ifndef __pinocchio_
multibody_
joint_mimic_hpp__
#define __pinocchio_
multibody_
joint_mimic_hpp__
#include "pinocchio/macros.hpp"
#include "pinocchio/multibody/joint/joint-base.hpp"
...
...
@@ -316,6 +316,7 @@ namespace pinocchio
return
*
this
;
}
using
Base
::
isEqual
;
bool
isEqual
(
const
JointDataMimic
&
other
)
const
{
return
Base
::
isEqual
(
other
)
...
...
@@ -635,4 +636,4 @@ namespace pinocchio
}
// namespace pinocchio
#endif // ifndef __pinocchio_joint_mimic_hpp__
#endif // ifndef __pinocchio_
multibody_
joint_mimic_hpp__
Write
Preview
Markdown
is supported
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