From a30f5ae4d7fcd7b790edccb59075276ff48539f1 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Mon, 18 May 2020 22:37:07 +0200
Subject: [PATCH] Fix C++98 compatibility.
---
src/problem-solver.cc | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/problem-solver.cc b/src/problem-solver.cc
index 381549a..33b6f3c 100644
--- a/src/problem-solver.cc
+++ b/src/problem-solver.cc
@@ -270,27 +270,27 @@ namespace hpp {
(Constraint_t::createConstraintAndComplement
(name, robot_, floorSurfaces, objectSurfaces, margin));
- addNumericalConstraint(std::get<0>(constraints)->function().name(),
- std::get<0>(constraints));
- addNumericalConstraint(std::get<1>(constraints)->function().name(),
- std::get<1>(constraints));
- addNumericalConstraint(std::get<2>(constraints)->function().name(),
- std::get<2>(constraints));
+ addNumericalConstraint(boost::get<0>(constraints)->function().name(),
+ boost::get<0>(constraints));
+ addNumericalConstraint(boost::get<1>(constraints)->function().name(),
+ boost::get<1>(constraints));
+ addNumericalConstraint(boost::get<2>(constraints)->function().name(),
+ boost::get<2>(constraints));
// Set security margin to contact constraint
assert(HPP_DYNAMIC_PTR_CAST(constraints::ConvexShapeContact,
- std::get<0>(constraints)->functionPtr()));
+ boost::get<0>(constraints)->functionPtr()));
constraints::ConvexShapeContactPtr_t contactFunction
(HPP_STATIC_PTR_CAST(constraints::ConvexShapeContact,
- std::get<0>(constraints)->functionPtr()));
+ boost::get<0>(constraints)->functionPtr()));
contactFunction->setNormalMargin(margin);
constraintsAndComplements.push_back (
- ConstraintAndComplement_t (std::get<0>(constraints),
- std::get<1>(constraints),
- std::get<2>(constraints)));
+ ConstraintAndComplement_t (boost::get<0>(constraints),
+ boost::get<1>(constraints),
+ boost::get<2>(constraints)));
if (constraintGraph ())
- constraintGraph ()->registerConstraints(std::get<0>(constraints),
- std::get<1>(constraints),
- std::get<2>(constraints));
+ constraintGraph ()->registerConstraints(boost::get<0>(constraints),
+ boost::get<1>(constraints),
+ boost::get<2>(constraints));
}
void ProblemSolver::createPrePlacementConstraint
--
GitLab