Skip to content
Snippets Groups Projects
Commit 5e3f84e6 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Fix broken const-correctness

parent d83c96ab
No related branches found
No related tags found
No related merge requests found
......@@ -49,12 +49,13 @@ class HPP_MANIPULATION_DLLAPI ConnectedComponent : public core::ConnectedCompone
/// \param roadmap node to be added
void addNode (const core::NodePtr_t& node);
RoadmapNodes_t getRoadmapNodes (const graph::NodePtr_t graphNode);
const RoadmapNodes_t& getRoadmapNodes (const graph::NodePtr_t graphNode) const;
protected:
private:
GraphNodes_t graphNodeMap_;
RoadmapPtr_t roadmap_;
static RoadmapNodes_t empty_;
}; // class ConnectedComponent
} // namespace manipulation
} // namespace hpp
......
......@@ -23,6 +23,7 @@
namespace hpp {
namespace manipulation {
RoadmapNodes_t ConnectedComponent::empty_ = RoadmapNodes_t();
ConnectedComponentPtr_t ConnectedComponent::create(const RoadmapWkPtr_t& roadmap)
{
......@@ -74,17 +75,15 @@ namespace hpp {
}
RoadmapNodes_t ConnectedComponent::getRoadmapNodes (const graph::NodePtr_t graphNode)
const RoadmapNodes_t& ConnectedComponent::getRoadmapNodes (
const graph::NodePtr_t graphNode) const
{
RoadmapNodes_t res;
GraphNodes_t::iterator mapIt = graphNodeMap_.find(graphNode);
if (mapIt != graphNodeMap_.end()) {
res = mapIt->second;
}
return res;
GraphNodes_t::const_iterator mapIt = graphNodeMap_.find(graphNode);
if (mapIt != graphNodeMap_.end())
return mapIt->second;
return empty_;
}
} // namespace manipulation
} // namespace hpp
......@@ -83,7 +83,7 @@ namespace hpp {
{
core::NodePtr_t result = NULL;
minDistance = std::numeric_limits <value_type>::infinity ();
RoadmapNodes_t roadmapNodes = connectedComponent->getRoadmapNodes (node);
const RoadmapNodes_t& roadmapNodes = connectedComponent->getRoadmapNodes (node);
for (RoadmapNodes_t::const_iterator itNode = roadmapNodes.begin ();
itNode != roadmapNodes.end (); ++itNode) {
value_type d = (*distance()) (*(*itNode)->configuration (),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment