fixed manipulation::ConnectedComponent::merge argument to be identical with...

fixed manipulation::ConnectedComponent::merge argument to be identical with core::ConnectedComponent::merge

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

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.