Removed auto keyword

orocos · Oct 29, 2019 · f591582 · f591582
1 parent 15ba3b2
commit f591582
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/orocos_kdl/src/chain.cpp b/orocos_kdl/src/chain.cpp
@@ -20,7 +20,6 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "chain.hpp"
-// #include <algorithm>
 
 namespace KDL {
     using namespace std;

diff --git a/orocos_kdl/src/tree.cpp b/orocos_kdl/src/tree.cpp
@@ -178,7 +178,7 @@ void Tree::deleteSegmentsRecursive(SegmentMap::const_iterator segment, unsigned
   if(GetTreeElementSegment(segment->second).getJoint().getType() != Joint::None)
     nj++;
   // remove the segment from the map
-  segments.erase(segment);
+  segments.erase(segment->first);
 }
 
 unsigned int Tree::deleteSegmentsFrom(SegmentMap::const_iterator segment) {
@@ -187,8 +187,8 @@ unsigned int Tree::deleteSegmentsFrom(SegmentMap::const_iterator segment) {
     return 0;
 
   // remove references to this segment from its parent
-  auto parent = segments.find(GetTreeElementParent(segment->second)->first);
-  auto& parent_children = GetTreeElementChildren(parent->second);
+  SegmentMap::iterator parent = segments.find(GetTreeElementParent(segment->second)->first);
+  std::vector<SegmentMap::const_iterator>& parent_children = GetTreeElementChildren(parent->second);
   parent_children.erase(std::remove(parent_children.begin(), parent_children.end(), segment));
 
   // delete children recursively