From 27413eebc4be025605a5cea8e950bf348e7555b5 Mon Sep 17 00:00:00 2001
From: joanvallve <jvallve@iri.upc.edu>
Date: Fri, 14 Oct 2016 13:20:37 +0200
Subject: [PATCH] undo wrong commented deletes
---
src/frame_base.h | 4 ++--
src/hardware_base.cpp | 2 +-
src/hardware_base.h | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/frame_base.h b/src/frame_base.h
index be960ba39..5317e643e 100644
--- a/src/frame_base.h
+++ b/src/frame_base.h
@@ -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
diff --git a/src/hardware_base.cpp b/src/hardware_base.cpp
index 221d824ce..0b9c3fef9 100644
--- a/src/hardware_base.cpp
+++ b/src/hardware_base.cpp
@@ -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
diff --git a/src/hardware_base.h b/src/hardware_base.h
index 410157e8c..fb20fd8d9 100644
--- a/src/hardware_base.h
+++ b/src/hardware_base.h
@@ -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
--
GitLab