From 5bafa0f0b2ac570e9f93c7375a2871205d4e6af4 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Wed, 7 Oct 2015 10:36:59 +0200
Subject: [PATCH] Fix some compilation warnings and clean code
* rename PartialShortcutTrait into PartialShortcutTraits
---
include/hpp/manipulation/graph/edge.hh | 1 +
src/graph-path-validation.cc | 4 ++--
src/graph/graph-component.cc | 1 -
src/problem-solver.cc | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/hpp/manipulation/graph/edge.hh b/include/hpp/manipulation/graph/edge.hh
index 06b1855..bc36ccc 100644
--- a/include/hpp/manipulation/graph/edge.hh
+++ b/include/hpp/manipulation/graph/edge.hh
@@ -99,6 +99,7 @@ namespace hpp {
{
return steeringMethod_;
}
+
/// Print the object in a stream.
virtual std::ostream& dotPrint (std::ostream& os, dot::DrawingAttributes da = dot::DrawingAttributes ()) const;
diff --git a/src/graph-path-validation.cc b/src/graph-path-validation.cc
index 74646b6..292dff7 100644
--- a/src/graph-path-validation.cc
+++ b/src/graph-path-validation.cc
@@ -34,8 +34,8 @@ namespace hpp {
assert (path);
bool success = impl_validate (path, reverse, validPart);
assert (constraintGraph_);
- assert (constraintGraph_->getNode ((*validPart) (validPart->timeRange ().first)));
- assert (constraintGraph_->getNode ((*validPart) (validPart->timeRange ().second)));
+ assert (constraintGraph_->getNode (validPart->initial ()));
+ assert (constraintGraph_->getNode (validPart->end ()));
return success;
}
diff --git a/src/graph/graph-component.cc b/src/graph/graph-component.cc
index b7b92cd..c4d49d2 100644
--- a/src/graph/graph-component.cc
+++ b/src/graph/graph-component.cc
@@ -51,7 +51,6 @@ namespace hpp {
return components_;
}
-
std::size_t GraphComponent::id () const
{
return id_;
diff --git a/src/problem-solver.cc b/src/problem-solver.cc
index 977b713..4572755 100644
--- a/src/problem-solver.cc
+++ b/src/problem-solver.cc
@@ -40,8 +40,8 @@
namespace hpp {
namespace manipulation {
namespace {
- struct PartialShortcutTrait :
- core::pathOptimization::PartialShortcutTrait {
+ struct PartialShortcutTraits :
+ core::pathOptimization::PartialShortcutTraits {
static bool removeLockedJoints () { return false; }
};
}
@@ -60,7 +60,7 @@ namespace hpp {
addPathOptimizerType ("Graph-RandomShortcut",
GraphOptimizer::create <core::RandomShortcut>);
addPathOptimizerType ("PartialShortcut", core::pathOptimization::
- PartialShortcut::createWithTrait <PartialShortcutTrait>);
+ PartialShortcut::createWithTraits <PartialShortcutTraits>);
addPathOptimizerType ("Graph-PartialShortcut",
GraphOptimizer::create <core::pathOptimization::PartialShortcut>);
pathPlannerType ("M-RRT");
--
GitLab