Skip to content
Snippets Groups Projects
Commit 27413eeb authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

undo wrong commented deletes

parent 67fb28a4
No related branches found
No related tags found
No related merge requests found
......@@ -234,14 +234,14 @@ inline void FrameBase::removeCapture(const CaptureBaseIter& _capt_iter)
{
//std::cout << "removing capture " << (*_capt_iter)->nodeId() << " from Frame " << nodeId() << std::endl;
capture_list_.erase(_capt_iter);
//delete *_capt_iter;
delete *_capt_iter;
}
inline void FrameBase::removeCapture(const CaptureBasePtr _capt_ptr)
{
//std::cout << "removing capture " << (*_capt_iter)->nodeId() << " from Frame " << nodeId() << std::endl;
capture_list_.remove(_capt_ptr);
//delete _capt_ptr;
delete _capt_ptr;
}
inline StateStatus FrameBase::getStatus() const
......
......@@ -38,7 +38,7 @@ SensorBasePtr HardwareBase::addSensor(SensorBasePtr _sensor_ptr)
void HardwareBase::removeSensor(SensorBasePtr _sensor_ptr)
{
sensor_list_.remove(_sensor_ptr);
// delete _sensor_ptr;
delete _sensor_ptr;
}
} // namespace wolf
......@@ -55,14 +55,12 @@ namespace wolf {
inline void HardwareBase::removeSensor(const SensorBaseIter& _sensor_iter)
{
sensor_list_.erase(_sensor_iter);
// delete * _sensor_iter;
// removeDownNode(_sensor_iter);
delete * _sensor_iter;
}
inline SensorBaseList* HardwareBase::getSensorListPtr()
{
return & sensor_list_;
// return getDownNodeListPtr();
}
} // namespace wolf
......
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