diff options
author | Nicholas Corgan <nick.corgan@ettus.com> | 2014-08-13 08:44:31 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2014-09-01 17:58:24 +0200 |
commit | 654c5b06c086ce8b13a5be07e680004c96da8501 (patch) | |
tree | be8adaf06d3b1cebbd20e1b1856df61bfa06ce87 /host/lib/usrp/common | |
parent | d88ae533c48495dbb86ca5fe2e7ddd05ab3c8a4e (diff) | |
download | uhd-654c5b06c086ce8b13a5be07e680004c96da8501.tar.gz uhd-654c5b06c086ce8b13a5be07e680004c96da8501.tar.bz2 uhd-654c5b06c086ce8b13a5be07e680004c96da8501.zip |
Added missing pure virtual destructors to base classes
Diffstat (limited to 'host/lib/usrp/common')
-rw-r--r-- | host/lib/usrp/common/ad9361_ctrl.cpp | 15 | ||||
-rw-r--r-- | host/lib/usrp/common/ad9361_ctrl.hpp | 17 | ||||
-rw-r--r-- | host/lib/usrp/common/recv_packet_demuxer.cpp | 6 | ||||
-rw-r--r-- | host/lib/usrp/common/recv_packet_demuxer.hpp | 4 |
4 files changed, 38 insertions, 4 deletions
diff --git a/host/lib/usrp/common/ad9361_ctrl.cpp b/host/lib/usrp/common/ad9361_ctrl.cpp index dea18ff06..555eace85 100644 --- a/host/lib/usrp/common/ad9361_ctrl.cpp +++ b/host/lib/usrp/common/ad9361_ctrl.cpp @@ -1,5 +1,18 @@ // -// Copyright 2014 Ettus Research LLC +// Copyright 2012-2014 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // #include "ad9361_ctrl.hpp" diff --git a/host/lib/usrp/common/ad9361_ctrl.hpp b/host/lib/usrp/common/ad9361_ctrl.hpp index f1659f30e..93d697349 100644 --- a/host/lib/usrp/common/ad9361_ctrl.hpp +++ b/host/lib/usrp/common/ad9361_ctrl.hpp @@ -1,5 +1,18 @@ // -// Copyright 2014 Ettus Research LLC +// Copyright 2012-2014 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // #ifndef INCLUDED_AD9361_CTRL_HPP @@ -22,6 +35,8 @@ class ad9361_ctrl : public boost::noncopyable public: typedef boost::shared_ptr<ad9361_ctrl> sptr; + virtual ~ad9361_ctrl(void) {}; + //! make a new codec control object static sptr make_spi( ad9361_params::sptr client_settings, uhd::spi_iface::sptr spi_iface, boost::uint32_t slave_num); diff --git a/host/lib/usrp/common/recv_packet_demuxer.cpp b/host/lib/usrp/common/recv_packet_demuxer.cpp index fe606213c..db0f71280 100644 --- a/host/lib/usrp/common/recv_packet_demuxer.cpp +++ b/host/lib/usrp/common/recv_packet_demuxer.cpp @@ -1,5 +1,5 @@ // -// Copyright 2011 Ettus Research LLC +// Copyright 2011,2014 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -47,6 +47,10 @@ static UHD_INLINE boost::uint32_t extract_sid(managed_recv_buffer::sptr &buff){ return uhd::wtohx(buff->cast<const boost::uint32_t *>()[1]); } +recv_packet_demuxer::~recv_packet_demuxer(void){ + /* NOP */ +} + class recv_packet_demuxer_impl : public uhd::usrp::recv_packet_demuxer{ public: recv_packet_demuxer_impl( diff --git a/host/lib/usrp/common/recv_packet_demuxer.hpp b/host/lib/usrp/common/recv_packet_demuxer.hpp index fde756d27..a03f25f47 100644 --- a/host/lib/usrp/common/recv_packet_demuxer.hpp +++ b/host/lib/usrp/common/recv_packet_demuxer.hpp @@ -1,5 +1,5 @@ // -// Copyright 2011 Ettus Research LLC +// Copyright 2011,2014 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -29,6 +29,8 @@ namespace uhd{ namespace usrp{ public: typedef boost::shared_ptr<recv_packet_demuxer> sptr; + virtual ~recv_packet_demuxer(void) = 0; + //! Make a new demuxer from a transport and parameters static sptr make(transport::zero_copy_if::sptr transport, const size_t size, const boost::uint32_t sid_base); |