From 33ca25d1fffb311b032df07901ec1992c03cefb0 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Sat, 13 Feb 2016 18:28:05 +0100
Subject: [PATCH] Add StringList_t typedef
---
include/hpp/manipulation/fwd.hh | 1 +
include/hpp/manipulation/problem-solver.hh | 8 ++++----
src/problem-solver.cc | 10 ++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/include/hpp/manipulation/fwd.hh b/include/hpp/manipulation/fwd.hh
index e6bc6b78..2a1c6aee 100644
--- a/include/hpp/manipulation/fwd.hh
+++ b/include/hpp/manipulation/fwd.hh
@@ -119,6 +119,7 @@ namespace hpp {
typedef std::vector<core::vector3_t> Shape_t;
typedef std::pair <JointPtr_t, Shape_t> JointAndShape_t;
typedef std::list <JointAndShape_t> JointAndShapes_t;
+ typedef std::list <std::string> StringList_t;
typedef HPP_MANIPULATION_DEPRECATED Shape_t Triangle;
typedef HPP_MANIPULATION_DEPRECATED JointAndShape_t JointAndTriangle_t;
typedef HPP_MANIPULATION_DEPRECATED JointAndShapes_t JointAndTriangles_t;
diff --git a/include/hpp/manipulation/problem-solver.hh b/include/hpp/manipulation/problem-solver.hh
index a451f131..406fc5c5 100644
--- a/include/hpp/manipulation/problem-solver.hh
+++ b/include/hpp/manipulation/problem-solver.hh
@@ -99,8 +99,8 @@ namespace hpp {
/// \param margin see hpp::constraints::ConvexShapeContact::setNormalMargin
///
void createPlacementConstraint (const std::string& name,
- const std::list<std::string>& surface1,
- const std::list<std::string>& surface2,
+ const StringList_t& surface1,
+ const StringList_t& surface2,
const value_type& margin = 1e-4);
/// Create pre-placement constraint
@@ -111,8 +111,8 @@ namespace hpp {
/// \param margin see hpp::constraints::ConvexShapeContact::setNormalMargin
///
void createPrePlacementConstraint (const std::string& name,
- const std::list<std::string>& surface1,
- const std::list<std::string>& surface2,
+ const StringList_t& surface1,
+ const StringList_t& surface2,
const value_type& width,
const value_type& margin = 1e-4);
diff --git a/src/problem-solver.cc b/src/problem-solver.cc
index 3b1228af..621c187c 100644
--- a/src/problem-solver.cc
+++ b/src/problem-solver.cc
@@ -50,8 +50,6 @@
namespace hpp {
namespace manipulation {
namespace {
- typedef std::list<std::string> StringList_t;
-
struct PartialShortcutTraits :
core::pathOptimization::PartialShortcutTraits {
static bool removeLockedJoints () { return false; }
@@ -151,8 +149,8 @@ namespace hpp {
}
void ProblemSolver::createPlacementConstraint
- (const std::string& name, const std::list<std::string>& surface1,
- const std::list<std::string>& surface2, const value_type& margin)
+ (const std::string& name, const StringList_t& surface1,
+ const StringList_t& surface2, const value_type& margin)
{
if (!robot_) throw std::runtime_error ("No robot loaded");
using constraints::ConvexShape;
@@ -201,8 +199,8 @@ namespace hpp {
}
void ProblemSolver::createPrePlacementConstraint
- (const std::string& name, const std::list<std::string>& surface1,
- const std::list<std::string>& surface2, const value_type& width,
+ (const std::string& name, const StringList_t& surface1,
+ const StringList_t& surface2, const value_type& width,
const value_type& margin)
{
if (!robot_) throw std::runtime_error ("No robot loaded");
--
GitLab