From dfc364c72c3f5197824cdeca4209fb5f074d361c Mon Sep 17 00:00:00 2001
From: Akseppal <seppala@laas.fr>
Date: Wed, 6 Jan 2016 17:17:12 +0100
Subject: [PATCH] fixed manipulation::ConnectedComponent::merge argument to be
identical with core::ConnectedComponent::merge
---
include/hpp/manipulation/connected-component.hh | 2 +-
src/connected-component.cc | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/hpp/manipulation/connected-component.hh b/include/hpp/manipulation/connected-component.hh
index a27c6cf2..aacad258 100644
--- a/include/hpp/manipulation/connected-component.hh
+++ b/include/hpp/manipulation/connected-component.hh
@@ -51,7 +51,7 @@ class HPP_MANIPULATION_DLLAPI ConnectedComponent : public core::ConnectedCompone
/// Merge two connected components (extension of core::ConnectedComponent::merge)
/// \param other manipulation connected component to merge into this one.
/// \note other will be empty after calling this method.
- void merge (const ConnectedComponentPtr_t& other);
+ void merge (const core::ConnectedComponentPtr_t& otherCC);
/// Add roadmap node to connected component
/// \param roadmap node to be added
diff --git a/src/connected-component.cc b/src/connected-component.cc
index 3c2a3fe1..b4a0b9cf 100644
--- a/src/connected-component.cc
+++ b/src/connected-component.cc
@@ -40,10 +40,10 @@ namespace hpp {
// CC->rdmp_ = roadmap.lock ();
// }
- void ConnectedComponent::merge (const ConnectedComponentPtr_t& other)
+ void ConnectedComponent::merge (const core::ConnectedComponentPtr_t& otherCC)
{
- core::ConnectedComponent::merge(other);
-
+ core::ConnectedComponent::merge(otherCC);
+ const ConnectedComponentPtr_t other = boost::static_pointer_cast <ConnectedComponent> (otherCC);
/// take all graph nodes in other->graphNodeMap_ and put them in this->graphNodeMap_
/// if they already exist in this->graphNodeMap_, append roadmap nodes from other graph node
/// to graph node in this.
--
GitLab