diff options
| author | Thomas Habets <thomas@habets.se> | 2019-12-21 16:36:38 +0000 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2020-01-02 23:43:00 +0100 |
| commit | dbf75ac0cab2fa34285da46e1c0514abed44d4a5 (patch) | |
| tree | 6b6276a7e9c98e20e172b3052355d15a390f03ca | |
| parent | 0a009dced1f442cc8b0e06846396ff206f3eb2b4 (diff) | |
gr-digital/fll_band_edge: Modernize C++
| -rw-r--r-- | gr-digital/lib/fll_band_edge_cc_impl.cc | 16 | ||||
| -rw-r--r-- | gr-digital/lib/fll_band_edge_cc_impl.h | 5 |
2 files changed, 6 insertions, 15 deletions
diff --git a/gr-digital/lib/fll_band_edge_cc_impl.cc b/gr-digital/lib/fll_band_edge_cc_impl.cc index d669ac6216..8db653603a 100644 --- a/gr-digital/lib/fll_band_edge_cc_impl.cc +++ b/gr-digital/lib/fll_band_edge_cc_impl.cc @@ -87,12 +87,6 @@ fll_band_edge_cc_impl::fll_band_edge_cc_impl(float samps_per_sym, design_filter(d_sps, d_rolloff, d_filter_size); } -fll_band_edge_cc_impl::~fll_band_edge_cc_impl() -{ - delete d_filter_upper; - delete d_filter_lower; -} - /******************************************************************* SET FUNCTIONS *******************************************************************/ @@ -186,17 +180,15 @@ void fll_band_edge_cc_impl::design_filter(float samps_per_sym, void fll_band_edge_cc_impl::print_taps() { - unsigned int i; - printf("Upper Band-edge: ["); - for (i = 0; i < d_taps_upper.size(); i++) { - printf(" %.4e + %.4ej,", d_taps_upper[i].real(), d_taps_upper[i].imag()); + for (const auto& tap : d_taps_upper) { + printf(" %.4e + %.4ej,", tap.real(), tap.imag()); } printf("]\n\n"); printf("Lower Band-edge: ["); - for (i = 0; i < d_taps_lower.size(); i++) { - printf(" %.4e + %.4ej,", d_taps_lower[i].real(), d_taps_lower[i].imag()); + for (const auto& tap : d_taps_lower) { + printf(" %.4e + %.4ej,", tap.real(), tap.imag()); } printf("]\n\n"); } diff --git a/gr-digital/lib/fll_band_edge_cc_impl.h b/gr-digital/lib/fll_band_edge_cc_impl.h index 7acb950117..501da19843 100644 --- a/gr-digital/lib/fll_band_edge_cc_impl.h +++ b/gr-digital/lib/fll_band_edge_cc_impl.h @@ -40,8 +40,8 @@ private: std::vector<gr_complex> d_taps_lower; std::vector<gr_complex> d_taps_upper; bool d_updated; - gr::filter::kernel::fir_filter_with_buffer_ccc* d_filter_lower; - gr::filter::kernel::fir_filter_with_buffer_ccc* d_filter_upper; + std::unique_ptr<gr::filter::kernel::fir_filter_with_buffer_ccc> d_filter_lower; + std::unique_ptr<gr::filter::kernel::fir_filter_with_buffer_ccc> d_filter_upper; /*! * Design the band-edge filter based on the number of samples @@ -58,7 +58,6 @@ public: float rolloff, int filter_size, float bandwidth); - ~fll_band_edge_cc_impl(); void set_samples_per_symbol(float sps); void set_rolloff(float rolloff); |