Skip to content

Commit 94831ed

Browse files
committed
fix compatibility with pinocchio v2.4.5
Following stack-of-tasks/pinocchio#1220, some Data can't be const anymore. This commit just removed const until compilation succedded again.
1 parent e7aff93 commit 94831ed

35 files changed

+38
-38
lines changed

include/tsid/bindings/python/contacts/contact-6d.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ namespace tsid
8282
return name;
8383
}
8484

85-
static math::ConstraintEquality computeMotionTask(Contact6d & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, const pinocchio::Data & data){
85+
static math::ConstraintEquality computeMotionTask(Contact6d & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, pinocchio::Data & data){
8686
self.computeMotionTask(t, q, v, data);
8787
math::ConstraintEquality cons(self.getMotionConstraint().name(), self.getMotionConstraint().matrix(), self.getMotionConstraint().vector());
8888
return cons;

include/tsid/bindings/python/contacts/contact-point.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ namespace tsid
8181
return name;
8282
}
8383

84-
static math::ConstraintEquality computeMotionTask(ContactPoint & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, const pinocchio::Data & data){
84+
static math::ConstraintEquality computeMotionTask(ContactPoint & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, pinocchio::Data & data){
8585
self.computeMotionTask(t, q, v, data);
8686
math::ConstraintEquality cons(self.getMotionConstraint().name(), self.getMotionConstraint().matrix(), self.getMotionConstraint().vector());
8787
return cons;

include/tsid/bindings/python/formulations/formulation.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ namespace tsid
8282
.def("getContactForce", &InvDynPythonVisitor::getContactForce, bp::args("name", "HQPOutput"))
8383
;
8484
}
85-
static pinocchio::Data data(const T & self){
85+
static pinocchio::Data data(T & self){
8686
pinocchio::Data data = self.data();
8787
return data;
8888
}

include/tsid/bindings/python/tasks/task-actuation-bounds.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ namespace tsid
6262
std::string name = self.name();
6363
return name;
6464
}
65-
static math::ConstraintInequality compute(Task & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, const pinocchio::Data & data){
65+
static math::ConstraintInequality compute(Task & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, pinocchio::Data & data){
6666
self.compute(t, q, v, data);
6767
math::ConstraintInequality cons(self.getConstraint().name(), self.getConstraint().matrix(),
6868
self.getConstraint().lowerBound(), self.getConstraint().upperBound());

include/tsid/bindings/python/tasks/task-am-equality.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace tsid
6767
std::string name = self.name();
6868
return name;
6969
}
70-
static math::ConstraintEquality compute(TaskAM & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, const pinocchio::Data & data){
70+
static math::ConstraintEquality compute(TaskAM & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, pinocchio::Data & data){
7171
self.compute(t, q, v, data);
7272
math::ConstraintEquality cons(self.getConstraint().name(), self.getConstraint().matrix(), self.getConstraint().vector());
7373
return cons;

include/tsid/bindings/python/tasks/task-com-equality.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ namespace tsid
7070
std::string name = self.name();
7171
return name;
7272
}
73-
static math::ConstraintEquality compute(TaskCOM & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, const pinocchio::Data & data){
73+
static math::ConstraintEquality compute(TaskCOM & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, pinocchio::Data & data){
7474
self.compute(t, q, v, data);
7575
math::ConstraintEquality cons(self.getConstraint().name(), self.getConstraint().matrix(), self.getConstraint().vector());
7676
return cons;

include/tsid/bindings/python/tasks/task-joint-bounds.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace tsid
6464
std::string name = self.name();
6565
return name;
6666
}
67-
static math::ConstraintBound compute(Task & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, const pinocchio::Data & data){
67+
static math::ConstraintBound compute(Task & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, pinocchio::Data & data){
6868
self.compute(t, q, v, data);
6969
math::ConstraintBound cons(self.getConstraint().name(),
7070
self.getConstraint().lowerBound(),

include/tsid/bindings/python/tasks/task-joint-posture.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ namespace tsid
7272
std::string name = self.name();
7373
return name;
7474
}
75-
static math::ConstraintEquality compute(TaskJoint & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, const pinocchio::Data & data){
75+
static math::ConstraintEquality compute(TaskJoint & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, pinocchio::Data & data){
7676
self.compute(t, q, v, data);
7777
math::ConstraintEquality cons(self.getConstraint().name(), self.getConstraint().matrix(), self.getConstraint().vector());
7878
return cons;

include/tsid/bindings/python/tasks/task-se3-equality.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ namespace tsid
7373
std::string name = self.name();
7474
return name;
7575
}
76-
static math::ConstraintEquality compute(TaskSE3 & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, const pinocchio::Data & data){
76+
static math::ConstraintEquality compute(TaskSE3 & self, const double t, const Eigen::VectorXd & q, const Eigen::VectorXd & v, pinocchio::Data & data){
7777
self.compute(t, q, v, data);
7878
math::ConstraintEquality cons(self.getConstraint().name(), self.getConstraint().matrix(), self.getConstraint().vector());
7979
return cons;

include/tsid/contacts/contact-6d.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ namespace tsid
7373
virtual const ConstraintBase & computeMotionTask(const double t,
7474
ConstRefVector q,
7575
ConstRefVector v,
76-
const Data & data);
76+
Data & data);
7777

7878
virtual const ConstraintInequality & computeForceTask(const double t,
7979
ConstRefVector q,

0 commit comments

Comments
 (0)