diff --git a/include/hpp/manipulation/connected-component.hh b/include/hpp/manipulation/connected-component.hh index c87d6c245a0b30c86eaeeb693960380ac411c120..4577c70beb487cffec9509e2c9e7e4acafe61978 100644 --- a/include/hpp/manipulation/connected-component.hh +++ b/include/hpp/manipulation/connected-component.hh @@ -32,7 +32,6 @@ namespace hpp { class HPP_MANIPULATION_DLLAPI ConnectedComponent : public core::ConnectedComponent { public: - typedef std::vector<RoadmapNodePtr_t> RoadmapNodes_t; /// Map of graph nodes within the connected component typedef std::map <graph::NodePtr_t, RoadmapNodes_t> GraphNodes_t; diff --git a/include/hpp/manipulation/fwd.hh b/include/hpp/manipulation/fwd.hh index f8d2297f12d9e9f0a2aaa71ff047a4fd3a0bc4a6..8c4fb07869ca802a5eecba85ea4fced65655bac8 100644 --- a/include/hpp/manipulation/fwd.hh +++ b/include/hpp/manipulation/fwd.hh @@ -55,6 +55,7 @@ namespace hpp { typedef boost::shared_ptr <Roadmap> RoadmapPtr_t; HPP_PREDEF_CLASS (RoadmapNode); typedef RoadmapNode* RoadmapNodePtr_t; + typedef std::vector<RoadmapNodePtr_t> RoadmapNodes_t; HPP_PREDEF_CLASS (ConnectedComponent); typedef boost::shared_ptr<ConnectedComponent> ConnectedComponentPtr_t; HPP_PREDEF_CLASS (WeighedDistance); diff --git a/src/connected-component.cc b/src/connected-component.cc index de92fb53e0d53d6bd244118be31e4cccba1f6ca6..101f2c3459b9d47be7329ac7030708011989d779 100644 --- a/src/connected-component.cc +++ b/src/connected-component.cc @@ -74,7 +74,7 @@ namespace hpp { } - ConnectedComponent::RoadmapNodes_t ConnectedComponent::getRoadmapNodes (const graph::NodePtr_t graphNode) + RoadmapNodes_t ConnectedComponent::getRoadmapNodes (const graph::NodePtr_t graphNode) { RoadmapNodes_t res; GraphNodes_t::iterator mapIt = graphNodeMap_.find(graphNode); diff --git a/src/roadmap.cc b/src/roadmap.cc index 9b4dcd4121215729d015f23b368144ed5fb0f2ad..746733c4b908ee4a63b5e2c4f0e2e7bf75eb1a88 100644 --- a/src/roadmap.cc +++ b/src/roadmap.cc @@ -83,9 +83,8 @@ namespace hpp { { core::NodePtr_t result = NULL; minDistance = std::numeric_limits <value_type>::infinity (); - ConnectedComponent::RoadmapNodes_t roadmapNodes = connectedComponent->getRoadmapNodes (node); - for (ConnectedComponent::RoadmapNodes_t::const_iterator itNode = - roadmapNodes.begin (); + RoadmapNodes_t roadmapNodes = connectedComponent->getRoadmapNodes (node); + for (RoadmapNodes_t::const_iterator itNode = roadmapNodes.begin (); itNode != roadmapNodes.end (); ++itNode) { value_type d = (*distance()) (*(*itNode)->configuration (), *configuration);