Move default destructor to header file, so compiler can make a better job

This commit is contained in:
Carles Fernandez 2019-07-21 19:32:52 +02:00
parent 6e5c79d144
commit be86771ede
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
226 changed files with 259 additions and 593 deletions

View File

@ -133,10 +133,7 @@ BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition(
{ {
LOG(ERROR) << "This implementation does not provide an output stream"; LOG(ERROR) << "This implementation does not provide an output stream";
} }
} };
BeidouB1iPcpsAcquisition::~BeidouB1iPcpsAcquisition() = default;
void BeidouB1iPcpsAcquisition::stop_acquisition() void BeidouB1iPcpsAcquisition::stop_acquisition()

View File

@ -60,7 +60,7 @@ public:
const std::string& role, unsigned int in_streams, const std::string& role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~BeidouB1iPcpsAcquisition(); ~BeidouB1iPcpsAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -134,9 +134,6 @@ BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition(
} }
BeidouB3iPcpsAcquisition::~BeidouB3iPcpsAcquisition() = default;
void BeidouB3iPcpsAcquisition::stop_acquisition() void BeidouB3iPcpsAcquisition::stop_acquisition()
{ {
} }

View File

@ -59,7 +59,7 @@ public:
const std::string& role, unsigned int in_streams, const std::string& role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~BeidouB3iPcpsAcquisition(); ~BeidouB3iPcpsAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -123,9 +123,6 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition(
} }
GalileoE1Pcps8msAmbiguousAcquisition::~GalileoE1Pcps8msAmbiguousAcquisition() = default;
void GalileoE1Pcps8msAmbiguousAcquisition::stop_acquisition() void GalileoE1Pcps8msAmbiguousAcquisition::stop_acquisition()
{ {
} }

View File

@ -54,7 +54,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GalileoE1Pcps8msAmbiguousAcquisition(); ~GalileoE1Pcps8msAmbiguousAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -167,9 +167,6 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
} }
GalileoE1PcpsAmbiguousAcquisition::~GalileoE1PcpsAmbiguousAcquisition() = default;
void GalileoE1PcpsAmbiguousAcquisition::stop_acquisition() void GalileoE1PcpsAmbiguousAcquisition::stop_acquisition()
{ {
} }

View File

@ -58,7 +58,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GalileoE1PcpsAmbiguousAcquisition(); ~GalileoE1PcpsAmbiguousAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -194,9 +194,6 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
} }
GalileoE1PcpsAmbiguousAcquisitionFpga::~GalileoE1PcpsAmbiguousAcquisitionFpga() = default;
void GalileoE1PcpsAmbiguousAcquisitionFpga::stop_acquisition() void GalileoE1PcpsAmbiguousAcquisitionFpga::stop_acquisition()
{ {
// this command causes the SW to reset the HW. // this command causes the SW to reset the HW.

View File

@ -56,7 +56,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GalileoE1PcpsAmbiguousAcquisitionFpga(); ~GalileoE1PcpsAmbiguousAcquisitionFpga() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -123,9 +123,6 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition
} }
GalileoE1PcpsCccwsrAmbiguousAcquisition::~GalileoE1PcpsCccwsrAmbiguousAcquisition() = default;
void GalileoE1PcpsCccwsrAmbiguousAcquisition::stop_acquisition() void GalileoE1PcpsCccwsrAmbiguousAcquisition::stop_acquisition()
{ {
} }

View File

@ -54,7 +54,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GalileoE1PcpsCccwsrAmbiguousAcquisition(); ~GalileoE1PcpsCccwsrAmbiguousAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -157,9 +157,6 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui
} }
GalileoE1PcpsQuickSyncAmbiguousAcquisition::~GalileoE1PcpsQuickSyncAmbiguousAcquisition() = default;
void GalileoE1PcpsQuickSyncAmbiguousAcquisition::stop_acquisition() void GalileoE1PcpsQuickSyncAmbiguousAcquisition::stop_acquisition()
{ {
} }

View File

@ -55,7 +55,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GalileoE1PcpsQuickSyncAmbiguousAcquisition(); ~GalileoE1PcpsQuickSyncAmbiguousAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -127,9 +127,6 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition(
} }
GalileoE1PcpsTongAmbiguousAcquisition::~GalileoE1PcpsTongAmbiguousAcquisition() = default;
void GalileoE1PcpsTongAmbiguousAcquisition::stop_acquisition() void GalileoE1PcpsTongAmbiguousAcquisition::stop_acquisition()
{ {
} }

View File

@ -54,7 +54,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GalileoE1PcpsTongAmbiguousAcquisition(); ~GalileoE1PcpsTongAmbiguousAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -132,9 +132,6 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf(
} }
GalileoE5aNoncoherentIQAcquisitionCaf::~GalileoE5aNoncoherentIQAcquisitionCaf() = default;
void GalileoE5aNoncoherentIQAcquisitionCaf::stop_acquisition() void GalileoE5aNoncoherentIQAcquisitionCaf::stop_acquisition()
{ {
} }

View File

@ -55,7 +55,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GalileoE5aNoncoherentIQAcquisitionCaf(); ~GalileoE5aNoncoherentIQAcquisitionCaf() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -165,9 +165,6 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con
} }
GalileoE5aPcpsAcquisition::~GalileoE5aPcpsAcquisition() = default;
void GalileoE5aPcpsAcquisition::stop_acquisition() void GalileoE5aPcpsAcquisition::stop_acquisition()
{ {
} }

View File

@ -49,7 +49,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GalileoE5aPcpsAcquisition(); ~GalileoE5aPcpsAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -197,9 +197,6 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
} }
GalileoE5aPcpsAcquisitionFpga::~GalileoE5aPcpsAcquisitionFpga() = default;
void GalileoE5aPcpsAcquisitionFpga::stop_acquisition() void GalileoE5aPcpsAcquisitionFpga::stop_acquisition()
{ {
// this command causes the SW to reset the HW. // this command causes the SW to reset the HW.

View File

@ -59,7 +59,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GalileoE5aPcpsAcquisitionFpga(); ~GalileoE5aPcpsAcquisitionFpga() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -138,9 +138,6 @@ GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition(
} }
GlonassL1CaPcpsAcquisition::~GlonassL1CaPcpsAcquisition() = default;
void GlonassL1CaPcpsAcquisition::stop_acquisition() void GlonassL1CaPcpsAcquisition::stop_acquisition()
{ {
} }

View File

@ -57,7 +57,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GlonassL1CaPcpsAcquisition(); ~GlonassL1CaPcpsAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -137,9 +137,6 @@ GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition(
} }
GlonassL2CaPcpsAcquisition::~GlonassL2CaPcpsAcquisition() = default;
void GlonassL2CaPcpsAcquisition::stop_acquisition() void GlonassL2CaPcpsAcquisition::stop_acquisition()
{ {
} }

View File

@ -56,7 +56,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GlonassL2CaPcpsAcquisition(); ~GlonassL2CaPcpsAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -161,9 +161,6 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
} }
GpsL1CaPcpsAcquisition::~GpsL1CaPcpsAcquisition() = default;
void GpsL1CaPcpsAcquisition::stop_acquisition() void GpsL1CaPcpsAcquisition::stop_acquisition()
{ {
} }

View File

@ -62,7 +62,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL1CaPcpsAcquisition(); ~GpsL1CaPcpsAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -109,9 +109,6 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
} }
GpsL1CaPcpsAcquisitionFineDoppler::~GpsL1CaPcpsAcquisitionFineDoppler() = default;
void GpsL1CaPcpsAcquisitionFineDoppler::stop_acquisition() void GpsL1CaPcpsAcquisitionFineDoppler::stop_acquisition()
{ {
} }

View File

@ -55,7 +55,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL1CaPcpsAcquisitionFineDoppler(); ~GpsL1CaPcpsAcquisitionFineDoppler() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -175,9 +175,6 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
} }
GpsL1CaPcpsAcquisitionFpga::~GpsL1CaPcpsAcquisitionFpga() = default;
void GpsL1CaPcpsAcquisitionFpga::stop_acquisition() void GpsL1CaPcpsAcquisitionFpga::stop_acquisition()
{ {
// this command causes the SW to reset the HW. // this command causes the SW to reset the HW.

View File

@ -60,7 +60,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL1CaPcpsAcquisitionFpga(); ~GpsL1CaPcpsAcquisitionFpga() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -101,9 +101,6 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition(
} }
GpsL1CaPcpsAssistedAcquisition::~GpsL1CaPcpsAssistedAcquisition() = default;
void GpsL1CaPcpsAssistedAcquisition::stop_acquisition() void GpsL1CaPcpsAssistedAcquisition::stop_acquisition()
{ {
} }

View File

@ -55,7 +55,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL1CaPcpsAssistedAcquisition(); ~GpsL1CaPcpsAssistedAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -121,9 +121,6 @@ GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition(
} }
GpsL1CaPcpsOpenClAcquisition::~GpsL1CaPcpsOpenClAcquisition() = default;
void GpsL1CaPcpsOpenClAcquisition::stop_acquisition() void GpsL1CaPcpsOpenClAcquisition::stop_acquisition()
{ {
} }

View File

@ -54,7 +54,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL1CaPcpsOpenClAcquisition(); ~GpsL1CaPcpsOpenClAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -150,9 +150,6 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition(
} }
GpsL1CaPcpsQuickSyncAcquisition::~GpsL1CaPcpsQuickSyncAcquisition() = default;
void GpsL1CaPcpsQuickSyncAcquisition::stop_acquisition() void GpsL1CaPcpsQuickSyncAcquisition::stop_acquisition()
{ {
} }

View File

@ -56,7 +56,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL1CaPcpsQuickSyncAcquisition(); ~GpsL1CaPcpsQuickSyncAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -112,9 +112,6 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
} }
GpsL1CaPcpsTongAcquisition::~GpsL1CaPcpsTongAcquisition() = default;
void GpsL1CaPcpsTongAcquisition::stop_acquisition() void GpsL1CaPcpsTongAcquisition::stop_acquisition()
{ {
} }

View File

@ -55,7 +55,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL1CaPcpsTongAcquisition(); ~GpsL1CaPcpsTongAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -165,9 +165,6 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
} }
GpsL2MPcpsAcquisition::~GpsL2MPcpsAcquisition() = default;
void GpsL2MPcpsAcquisition::stop_acquisition() void GpsL2MPcpsAcquisition::stop_acquisition()
{ {
} }

View File

@ -59,7 +59,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL2MPcpsAcquisition(); ~GpsL2MPcpsAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -164,9 +164,6 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
} }
GpsL2MPcpsAcquisitionFpga::~GpsL2MPcpsAcquisitionFpga() = default;
void GpsL2MPcpsAcquisitionFpga::stop_acquisition() void GpsL2MPcpsAcquisitionFpga::stop_acquisition()
{ {
} }

View File

@ -58,7 +58,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL2MPcpsAcquisitionFpga(); ~GpsL2MPcpsAcquisitionFpga() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -160,9 +160,6 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
} }
GpsL5iPcpsAcquisition::~GpsL5iPcpsAcquisition() = default;
void GpsL5iPcpsAcquisition::stop_acquisition() void GpsL5iPcpsAcquisition::stop_acquisition()
{ {
} }

View File

@ -59,7 +59,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL5iPcpsAcquisition(); ~GpsL5iPcpsAcquisition() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -178,9 +178,6 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
} }
GpsL5iPcpsAcquisitionFpga::~GpsL5iPcpsAcquisitionFpga() = default;
void GpsL5iPcpsAcquisitionFpga::stop_acquisition() void GpsL5iPcpsAcquisitionFpga::stop_acquisition()
{ {
// this command causes the SW to reset the HW. // this command causes the SW to reset the HW.

View File

@ -59,7 +59,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~GpsL5iPcpsAcquisitionFpga(); ~GpsL5iPcpsAcquisitionFpga() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -206,9 +206,6 @@ pcps_acquisition::pcps_acquisition(const Acq_Conf& conf_) : gr::block("pcps_acqu
} }
pcps_acquisition::~pcps_acquisition() = default;
void pcps_acquisition::set_resampler_latency(uint32_t latency_samples) void pcps_acquisition::set_resampler_latency(uint32_t latency_samples)
{ {
gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler

View File

@ -90,7 +90,7 @@ pcps_acquisition_sptr pcps_make_acquisition(const Acq_Conf& conf_);
class pcps_acquisition : public gr::block class pcps_acquisition : public gr::block
{ {
public: public:
~pcps_acquisition(); ~pcps_acquisition() = default;
/*! /*!
* \brief Set acquisition/tracking common Gnss_Synchro object pointer * \brief Set acquisition/tracking common Gnss_Synchro object pointer

View File

@ -84,9 +84,6 @@ pcps_acquisition_fpga::pcps_acquisition_fpga(pcpsconf_fpga_t conf_)
} }
pcps_acquisition_fpga::~pcps_acquisition_fpga() = default;
void pcps_acquisition_fpga::set_local_code() void pcps_acquisition_fpga::set_local_code()
{ {
acquisition_fpga->set_local_code(d_gnss_synchro->PRN); acquisition_fpga->set_local_code(d_gnss_synchro->PRN);

View File

@ -89,7 +89,7 @@ pcps_acquisition_fpga_sptr pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_);
class pcps_acquisition_fpga class pcps_acquisition_fpga
{ {
public: public:
~pcps_acquisition_fpga(); ~pcps_acquisition_fpga() = default;
/*! /*!
* \brief Set acquisition/tracking common Gnss_Synchro object pointer * \brief Set acquisition/tracking common Gnss_Synchro object pointer

View File

@ -108,9 +108,6 @@ Fpga_Acquisition::Fpga_Acquisition(std::string device_name,
} }
Fpga_Acquisition::~Fpga_Acquisition() = default;
bool Fpga_Acquisition::set_local_code(uint32_t PRN) bool Fpga_Acquisition::set_local_code(uint32_t PRN)
{ {
// select the code with the chosen PRN // select the code with the chosen PRN

View File

@ -56,7 +56,7 @@ public:
uint32_t *all_fft_codes, uint32_t *all_fft_codes,
uint32_t excludelimit); uint32_t excludelimit);
~Fpga_Acquisition(); ~Fpga_Acquisition() = default;
bool set_local_code(uint32_t PRN); bool set_local_code(uint32_t PRN);

View File

@ -118,9 +118,6 @@ Channel::Channel(ConfigurationInterface* configuration, uint32_t channel, std::s
} }
Channel::~Channel() = default;
void Channel::connect(gr::top_block_sptr top_block) void Channel::connect(gr::top_block_sptr top_block)
{ {
if (!flag_enable_fpga) if (!flag_enable_fpga)

View File

@ -69,7 +69,7 @@ public:
std::shared_ptr<TrackingInterface> trk, std::shared_ptr<TelemetryDecoderInterface> nav, std::shared_ptr<TrackingInterface> trk, std::shared_ptr<TelemetryDecoderInterface> nav,
std::string role, std::string implementation, std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue); std::string role, std::string implementation, std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue);
virtual ~Channel(); //!< Virtual destructor ~Channel() = default; //!< Destructor
void connect(gr::top_block_sptr top_block) override; //!< connects the tracking block to the top_block and to the telemetry void connect(gr::top_block_sptr top_block) override; //!< connects the tracking block to the top_block and to the telemetry
void disconnect(gr::top_block_sptr top_block) override; void disconnect(gr::top_block_sptr top_block) override;

View File

@ -55,9 +55,6 @@ channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr<ChannelFsm> cha
} }
channel_msg_receiver_cc::~channel_msg_receiver_cc() = default;
void channel_msg_receiver_cc::msg_handler_events(pmt::pmt_t msg) void channel_msg_receiver_cc::msg_handler_events(pmt::pmt_t msg)
{ {
bool result = false; bool result = false;

View File

@ -48,7 +48,7 @@ channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr<Channe
class channel_msg_receiver_cc : public gr::block class channel_msg_receiver_cc : public gr::block
{ {
public: public:
~channel_msg_receiver_cc(); //!< Default destructor ~channel_msg_receiver_cc() = default; //!< Default destructor
private: private:
friend channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr<ChannelFsm> channel_fsm, bool repeat); friend channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr<ChannelFsm> channel_fsm, bool repeat);

View File

@ -54,10 +54,6 @@ ArraySignalConditioner::ArraySignalConditioner(ConfigurationInterface *configura
} }
// Destructor
ArraySignalConditioner::~ArraySignalConditioner() = default;
void ArraySignalConditioner::connect(gr::top_block_sptr top_block) void ArraySignalConditioner::connect(gr::top_block_sptr top_block)
{ {
// note: the array signal conditioner do not have data type adapter, and must use the array input filter (multichannel) // note: the array signal conditioner do not have data type adapter, and must use the array input filter (multichannel)

View File

@ -55,8 +55,8 @@ public:
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt, std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation); std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation);
//! Virtual destructor //! Destructor
virtual ~ArraySignalConditioner(); ~ArraySignalConditioner() = default;
void connect(gr::top_block_sptr top_block) override; void connect(gr::top_block_sptr top_block) override;
void disconnect(gr::top_block_sptr top_block) override; void disconnect(gr::top_block_sptr top_block) override;

View File

@ -54,10 +54,6 @@ SignalConditioner::SignalConditioner(ConfigurationInterface *configuration,
} }
// Destructor
SignalConditioner::~SignalConditioner() = default;
void SignalConditioner::connect(gr::top_block_sptr top_block) void SignalConditioner::connect(gr::top_block_sptr top_block)
{ {
if (connected_) if (connected_)

View File

@ -52,8 +52,8 @@ public:
std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt, std::shared_ptr<GNSSBlockInterface> data_type_adapt, std::shared_ptr<GNSSBlockInterface> in_filt,
std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation); std::shared_ptr<GNSSBlockInterface> res, std::string role, std::string implementation);
//! Virtual destructor //! Destructor
virtual ~SignalConditioner(); ~SignalConditioner() = default;
void connect(gr::top_block_sptr top_block) override; void connect(gr::top_block_sptr top_block) override;
void disconnect(gr::top_block_sptr top_block) override; void disconnect(gr::top_block_sptr top_block) override;

View File

@ -71,9 +71,6 @@ ByteToShort::ByteToShort(ConfigurationInterface* configuration, std::string role
} }
ByteToShort::~ByteToShort() = default;
void ByteToShort::connect(gr::top_block_sptr top_block) void ByteToShort::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -49,7 +49,7 @@ public:
std::string role, unsigned int in_streams, std::string role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~ByteToShort(); ~ByteToShort() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -76,9 +76,6 @@ IbyteToCbyte::IbyteToCbyte(ConfigurationInterface* configuration, const std::str
} }
IbyteToCbyte::~IbyteToCbyte() = default;
void IbyteToCbyte::connect(gr::top_block_sptr top_block) void IbyteToCbyte::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -51,7 +51,7 @@ public:
const std::string& role, unsigned int in_streams, const std::string& role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~IbyteToCbyte(); ~IbyteToCbyte() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -74,9 +74,6 @@ IbyteToComplex::IbyteToComplex(ConfigurationInterface* configuration, const std:
} }
IbyteToComplex::~IbyteToComplex() = default;
void IbyteToComplex::connect(gr::top_block_sptr top_block) void IbyteToComplex::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -51,7 +51,7 @@ public:
const std::string& role, unsigned int in_streams, const std::string& role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~IbyteToComplex(); ~IbyteToComplex() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -76,9 +76,6 @@ IbyteToCshort::IbyteToCshort(ConfigurationInterface* configuration, const std::s
} }
IbyteToCshort::~IbyteToCshort() = default;
void IbyteToCshort::connect(gr::top_block_sptr top_block) void IbyteToCshort::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -51,7 +51,7 @@ public:
const std::string& role, unsigned int in_streams, const std::string& role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~IbyteToCshort(); ~IbyteToCshort() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -74,9 +74,6 @@ IshortToComplex::IshortToComplex(ConfigurationInterface* configuration, const st
} }
IshortToComplex::~IshortToComplex() = default;
void IshortToComplex::connect(gr::top_block_sptr top_block) void IshortToComplex::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -50,7 +50,7 @@ public:
const std::string& role, unsigned int in_streams, const std::string& role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~IshortToComplex(); ~IshortToComplex() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -76,9 +76,6 @@ IshortToCshort::IshortToCshort(ConfigurationInterface* configuration, const std:
} }
IshortToCshort::~IshortToCshort() = default;
void IshortToCshort::connect(gr::top_block_sptr top_block) void IshortToCshort::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -51,7 +51,7 @@ public:
const std::string& role, unsigned int in_streams, const std::string& role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~IshortToCshort(); ~IshortToCshort() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -77,9 +77,6 @@ BeamformerFilter::BeamformerFilter(
} }
BeamformerFilter::~BeamformerFilter() = default;
void BeamformerFilter::connect(gr::top_block_sptr top_block) void BeamformerFilter::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -50,7 +50,7 @@ public:
const std::string& role, unsigned int in_stream, const std::string& role, unsigned int in_stream,
unsigned int out_stream); unsigned int out_stream);
virtual ~BeamformerFilter(); ~BeamformerFilter() = default;
inline std::string role() override inline std::string role() override
{ {
@ -86,4 +86,4 @@ private:
gr::block_sptr file_sink_; gr::block_sptr file_sink_;
}; };
#endif /*GNSS_SDR_BEAMFORMER_FILTER_H_*/ #endif /* GNSS_SDR_BEAMFORMER_FILTER_H_ */

View File

@ -140,9 +140,6 @@ FirFilter::FirFilter(ConfigurationInterface* configuration, std::string role,
} }
FirFilter::~FirFilter() = default;
void FirFilter::connect(gr::top_block_sptr top_block) void FirFilter::connect(gr::top_block_sptr top_block)
{ {
if ((taps_item_type_ == "float") && (input_item_type_ == "gr_complex") && (output_item_type_ == "gr_complex")) if ((taps_item_type_ == "float") && (input_item_type_ == "gr_complex") && (output_item_type_ == "gr_complex"))

View File

@ -73,7 +73,7 @@ public:
unsigned int out_streams); unsigned int out_streams);
//! Destructor //! Destructor
virtual ~FirFilter(); ~FirFilter() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -121,7 +121,7 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration
} }
size_t item_size; size_t item_size;
LOG(INFO) << "Created freq_xlating_fir_filter with " << taps_.size()<<" taps"; LOG(INFO) << "Created freq_xlating_fir_filter with " << taps_.size() << " taps";
if ((taps_item_type_ == "float") && (input_item_type_ == "gr_complex") && (output_item_type_ == "gr_complex")) if ((taps_item_type_ == "float") && (input_item_type_ == "gr_complex") && (output_item_type_ == "gr_complex"))
{ {
item_size = sizeof(gr_complex); //output item_size = sizeof(gr_complex); //output
@ -195,9 +195,6 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration
} }
FreqXlatingFirFilter::~FreqXlatingFirFilter() = default;
void FreqXlatingFirFilter::connect(gr::top_block_sptr top_block) void FreqXlatingFirFilter::connect(gr::top_block_sptr top_block)
{ {
if ((taps_item_type_ == "float") && (input_item_type_ == "gr_complex") && (output_item_type_ == "gr_complex")) if ((taps_item_type_ == "float") && (input_item_type_ == "gr_complex") && (output_item_type_ == "gr_complex"))

View File

@ -71,7 +71,7 @@ public:
std::string role, unsigned int in_streams, std::string role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~FreqXlatingFirFilter(); ~FreqXlatingFirFilter() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -90,9 +90,6 @@ NotchFilter::NotchFilter(ConfigurationInterface* configuration, const std::strin
} }
NotchFilter::~NotchFilter() = default;
void NotchFilter::connect(gr::top_block_sptr top_block) void NotchFilter::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -48,7 +48,7 @@ public:
const std::string& role, unsigned int in_streams, const std::string& role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~NotchFilter(); ~NotchFilter() = default;
std::string role() std::string role()
{ {
return role_; return role_;
@ -79,4 +79,4 @@ private:
notch_sptr notch_filter_; notch_sptr notch_filter_;
}; };
#endif //GNSS_SDR_NOTCH_FILTER_H_ #endif // GNSS_SDR_NOTCH_FILTER_H_

View File

@ -98,9 +98,6 @@ NotchFilterLite::NotchFilterLite(ConfigurationInterface* configuration, const st
} }
NotchFilterLite::~NotchFilterLite() = default;
void NotchFilterLite::connect(gr::top_block_sptr top_block) void NotchFilterLite::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -48,7 +48,7 @@ public:
const std::string& role, unsigned int in_streams, const std::string& role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~NotchFilterLite(); ~NotchFilterLite() = default;
std::string role() std::string role()
{ {
return role_; return role_;
@ -79,4 +79,4 @@ private:
notch_lite_sptr notch_filter_lite_; notch_lite_sptr notch_filter_lite_;
}; };
#endif //GNSS_SDR_NOTCH_FILTER_LITE_H_ #endif // GNSS_SDR_NOTCH_FILTER_LITE_H_

View File

@ -105,9 +105,6 @@ PulseBlankingFilter::PulseBlankingFilter(ConfigurationInterface* configuration,
} }
PulseBlankingFilter::~PulseBlankingFilter() = default;
void PulseBlankingFilter::connect(gr::top_block_sptr top_block) void PulseBlankingFilter::connect(gr::top_block_sptr top_block)
{ {
if (input_item_type_ == "gr_complex") if (input_item_type_ == "gr_complex")

View File

@ -51,7 +51,7 @@ public:
std::string role, unsigned int in_streams, std::string role, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~PulseBlankingFilter(); ~PulseBlankingFilter() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -129,9 +129,6 @@ Pass_Through::Pass_Through(ConfigurationInterface* configuration, const std::str
} }
Pass_Through::~Pass_Through() = default;
void Pass_Through::connect(gr::top_block_sptr top_block) void Pass_Through::connect(gr::top_block_sptr top_block)
{ {
if (top_block) if (top_block)

View File

@ -56,7 +56,7 @@ public:
unsigned int in_stream, unsigned int in_stream,
unsigned int out_stream); unsigned int out_stream);
virtual ~Pass_Through(); ~Pass_Through() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -50,9 +50,6 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration,
} }
HybridObservables::~HybridObservables() = default;
void HybridObservables::connect(gr::top_block_sptr top_block) void HybridObservables::connect(gr::top_block_sptr top_block)
{ {
if (top_block) if (top_block)

View File

@ -54,7 +54,7 @@ public:
unsigned int in_streams, unsigned int in_streams,
unsigned int out_streams); unsigned int out_streams);
virtual ~HybridObservables(); ~HybridObservables() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -113,9 +113,6 @@ DirectResamplerConditioner::DirectResamplerConditioner(
} }
DirectResamplerConditioner::~DirectResamplerConditioner() = default;
void DirectResamplerConditioner::connect(gr::top_block_sptr top_block) void DirectResamplerConditioner::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -50,7 +50,7 @@ public:
const std::string& role, unsigned int in_stream, const std::string& role, unsigned int in_stream,
unsigned int out_stream); unsigned int out_stream);
virtual ~DirectResamplerConditioner(); ~DirectResamplerConditioner() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -105,9 +105,6 @@ MmseResamplerConditioner::MmseResamplerConditioner(
} }
MmseResamplerConditioner::~MmseResamplerConditioner() = default;
void MmseResamplerConditioner::connect(gr::top_block_sptr top_block) void MmseResamplerConditioner::connect(gr::top_block_sptr top_block)
{ {
if (dump_) if (dump_)

View File

@ -58,7 +58,7 @@ public:
const std::string& role, unsigned int in_stream, const std::string& role, unsigned int in_stream,
unsigned int out_stream); unsigned int out_stream);
virtual ~MmseResamplerConditioner(); ~MmseResamplerConditioner() = default;
inline std::string role() override inline std::string role() override
{ {

View File

@ -70,9 +70,6 @@ direct_resampler_conditioner_cb::direct_resampler_conditioner_cb(
} }
direct_resampler_conditioner_cb::~direct_resampler_conditioner_cb() = default;
void direct_resampler_conditioner_cb::forecast(int noutput_items, void direct_resampler_conditioner_cb::forecast(int noutput_items,
gr_vector_int &ninput_items_required) gr_vector_int &ninput_items_required)
{ {

View File

@ -50,7 +50,7 @@ direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb(
class direct_resampler_conditioner_cb : public gr::block class direct_resampler_conditioner_cb : public gr::block
{ {
public: public:
~direct_resampler_conditioner_cb(); ~direct_resampler_conditioner_cb() = default;
inline unsigned int sample_freq_in() const inline unsigned int sample_freq_in() const
{ {

View File

@ -68,9 +68,6 @@ direct_resampler_conditioner_cc::direct_resampler_conditioner_cc(
} }
direct_resampler_conditioner_cc::~direct_resampler_conditioner_cc() = default;
void direct_resampler_conditioner_cc::forecast(int noutput_items, void direct_resampler_conditioner_cc::forecast(int noutput_items,
gr_vector_int &ninput_items_required) gr_vector_int &ninput_items_required)
{ {

View File

@ -58,7 +58,7 @@ direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc(
class direct_resampler_conditioner_cc : public gr::block class direct_resampler_conditioner_cc : public gr::block
{ {
public: public:
~direct_resampler_conditioner_cc(); ~direct_resampler_conditioner_cc() = default;
inline unsigned int sample_freq_in() const inline unsigned int sample_freq_in() const
{ {
return d_sample_freq_in; return d_sample_freq_in;

View File

@ -71,9 +71,6 @@ direct_resampler_conditioner_cs::direct_resampler_conditioner_cs(
} }
direct_resampler_conditioner_cs::~direct_resampler_conditioner_cs() = default;
void direct_resampler_conditioner_cs::forecast(int noutput_items, void direct_resampler_conditioner_cs::forecast(int noutput_items,
gr_vector_int &ninput_items_required) gr_vector_int &ninput_items_required)
{ {

View File

@ -50,7 +50,7 @@ direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs(
class direct_resampler_conditioner_cs : public gr::block class direct_resampler_conditioner_cs : public gr::block
{ {
public: public:
~direct_resampler_conditioner_cs(); ~direct_resampler_conditioner_cs() = default;
inline unsigned int sample_freq_in() const inline unsigned int sample_freq_in() const
{ {

Some files were not shown because too many files have changed in this diff Show More