From 673a86b35563e0edb737be76bd22a9f55c8e638f Mon Sep 17 00:00:00 2001 From: Jeremie Deray <jeremie.deray@pal-robotics.com> Date: Thu, 26 Oct 2017 11:25:42 +0200 Subject: [PATCH] fix CaptureLaser2D compilation & default destructor --- src/capture_laser_2D.cpp | 7 +------ src/capture_laser_2D.h | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/capture_laser_2D.cpp b/src/capture_laser_2D.cpp index 6c35f216f..8d1a4ffea 100644 --- a/src/capture_laser_2D.cpp +++ b/src/capture_laser_2D.cpp @@ -3,12 +3,7 @@ namespace wolf { CaptureLaser2D::CaptureLaser2D(const TimeStamp& _ts, SensorBasePtr _sensor_ptr, const std::vector<float>& _ranges) : - CaptureBase("LASER 2D", _ts, _sensor_ptr), laser_ptr_(std::static_pointer_cast<SensorLaser2D>(sensor_ptr_.lock())), scan_(_ranges) -{ - // -} - -CaptureLaser2D::~CaptureLaser2D() + CaptureBase("LASER 2D", _ts, _sensor_ptr), laser_ptr_(std::static_pointer_cast<SensorLaser2D>(getSensorPtr())), scan_(_ranges) { // } diff --git a/src/capture_laser_2D.h b/src/capture_laser_2D.h index 3a0612860..f1cbf9eae 100644 --- a/src/capture_laser_2D.h +++ b/src/capture_laser_2D.h @@ -17,16 +17,16 @@ class SensorLaser2D; namespace wolf { WOLF_PTR_TYPEDEFS(CaptureLaser2D); - - + + class CaptureLaser2D : public CaptureBase { public: /** \brief Constructor with ranges **/ CaptureLaser2D(const TimeStamp& _ts, SensorBasePtr _sensor_ptr, const std::vector<float>& _ranges); - virtual ~CaptureLaser2D(); - + virtual ~CaptureLaser2D() = default; + laserscanutils::LaserScan& getScan(); void setSensorPtr(const SensorBasePtr sensor_ptr); -- GitLab