From b8d900a06a160e5844bc00aee9bba6d58f8ad977 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Fri, 29 May 2015 20:29:11 +0200
Subject: [PATCH] Use LockedJoints_t and NumericalConstraints_t from hpp-core
for convenience.
Conflicts:
include/hpp/manipulation/graph/fwd.hh
---
include/hpp/manipulation/graph/fwd.hh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/hpp/manipulation/graph/fwd.hh b/include/hpp/manipulation/graph/fwd.hh
index 100ee43c..c74bb895 100644
--- a/include/hpp/manipulation/graph/fwd.hh
+++ b/include/hpp/manipulation/graph/fwd.hh
@@ -57,7 +57,8 @@ namespace hpp {
typedef hpp::core::DifferentiableFunctionPtr_t DifferentiableFunctionPtr_t;
typedef hpp::core::SizeIntervals_t SizeIntervals_t;
typedef std::vector <SizeIntervals_t> IntervalsContainer_t;
- typedef std::list < LockedJointPtr_t > LockedJoints_t;
+ typedef hpp::core::NumericalConstraints_t NumericalConstraints_t;
+ typedef hpp::core::LockedJoints_t LockedJoints_t;
class Histogram;
class NodeHistogram;
--
GitLab