diff options
| author |   Marcus Müller <mmueller@gnuradio.org> | 2020-12-19 14:46:52 +0100 |
|---|---|---|
| committer |   Martin Braun <martin@gnuradio.org> | 2021-01-04 08:53:17 -0800 |
| commit | acf08b91594bbbcd0649a55ff377f242459f1a07 (patch) | |
| tree | 574ab0c47a44200166d19c77f55b6fcacb8877a2 /gr-filter/lib | |
| parent | gr-qtgui: Fix Frequency Sink max hold for half spectrum width option. (diff) | |
| download | gnuradio-acf08b91594bbbcd0649a55ff377f242459f1a07.tar.xz gnuradio-acf08b91594bbbcd0649a55ff377f242459f1a07.zip | |
C++14: Use std::make_unique instead of boost::make_unique
Also, clean up includes
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Diffstat (limited to 'gr-filter/lib')
| -rw-r--r-- | gr-filter/lib/dc_blocker_cc_impl.cc | 6 | ||||
| -rw-r--r-- | gr-filter/lib/dc_blocker_ff_impl.cc | 6 | ||||
| -rw-r--r-- | gr-filter/lib/fft_filter.cc | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/gr-filter/lib/dc_blocker_cc_impl.cc b/gr-filter/lib/dc_blocker_cc_impl.cc index c3e4fd1b3..c4c5435db 100644 --- a/gr-filter/lib/dc_blocker_cc_impl.cc +++ b/gr-filter/lib/dc_blocker_cc_impl.cc @@ -14,8 +14,8 @@ #include "dc_blocker_cc_impl.h" #include <gnuradio/io_signature.h> -#include <boost/make_unique.hpp> #include <cstdio> +#include <memory> namespace gr { namespace filter { @@ -59,8 +59,8 @@ dc_blocker_cc_impl::dc_blocker_cc_impl(int D, bool long_form) d_ma_1(D) { if (d_long_form) { - d_ma_2 = boost::make_unique<moving_averager_c>(D); - d_ma_3 = boost::make_unique<moving_averager_c>(D); + d_ma_2 = std::make_unique<moving_averager_c>(D); + d_ma_3 = std::make_unique<moving_averager_c>(D); d_delay_line = std::deque<gr_complex>(d_length - 1, gr_complex(0, 0)); } } diff --git a/gr-filter/lib/dc_blocker_ff_impl.cc b/gr-filter/lib/dc_blocker_ff_impl.cc index 347cd12b0..2e4f25d03 100644 --- a/gr-filter/lib/dc_blocker_ff_impl.cc +++ b/gr-filter/lib/dc_blocker_ff_impl.cc @@ -14,8 +14,8 @@ #include "dc_blocker_ff_impl.h" #include <gnuradio/io_signature.h> -#include <boost/make_unique.hpp> #include <cstdio> +#include <memory> namespace gr { namespace filter { @@ -54,8 +54,8 @@ dc_blocker_ff_impl::dc_blocker_ff_impl(int D, bool long_form) d_ma_1(D) { if (d_long_form) { - d_ma_2 = boost::make_unique<moving_averager_f>(D); - d_ma_3 = boost::make_unique<moving_averager_f>(D); + d_ma_2 = std::make_unique<moving_averager_f>(D); + d_ma_3 = std::make_unique<moving_averager_f>(D); d_delay_line = std::deque<float>(d_length - 1, 0); } } diff --git a/gr-filter/lib/fft_filter.cc b/gr-filter/lib/fft_filter.cc index a9a7bd73e..7531c23f5 100644 --- a/gr-filter/lib/fft_filter.cc +++ b/gr-filter/lib/fft_filter.cc @@ -15,9 +15,9 @@ #include <gnuradio/filter/fft_filter.h> #include <gnuradio/logger.h> #include <volk/volk.h> -#include <boost/smart_ptr/make_unique.hpp> #include <cstring> #include <iostream> +#include <memory> namespace gr { namespace filter { @@ -86,8 +86,8 @@ void fft_filter_fff::compute_sizes(int ntaps) // compute new plans if (d_fftsize != old_fftsize) { - d_fwdfft = boost::make_unique<fft::fft_real_fwd>(d_fftsize); - d_invfft = boost::make_unique<fft::fft_real_rev>(d_fftsize); + d_fwdfft = std::make_unique<fft::fft_real_fwd>(d_fftsize); + d_invfft = std::make_unique<fft::fft_real_rev>(d_fftsize); d_xformed_taps.resize(d_fftsize / 2 + 1); } } @@ -217,8 +217,8 @@ void fft_filter_ccc::compute_sizes(int ntaps) // compute new plans if (d_fftsize != old_fftsize) { - d_fwdfft = boost::make_unique<fft::fft_complex_fwd>(d_fftsize, d_nthreads); - d_invfft = boost::make_unique<fft::fft_complex_rev>(d_fftsize, d_nthreads); + d_fwdfft = std::make_unique<fft::fft_complex_fwd>(d_fftsize, d_nthreads); + d_invfft = std::make_unique<fft::fft_complex_rev>(d_fftsize, d_nthreads); d_xformed_taps.resize(d_fftsize); } } @@ -349,8 +349,8 @@ void fft_filter_ccf::compute_sizes(int ntaps) // compute new plans if (d_fftsize != old_fftsize) { - d_fwdfft = boost::make_unique<fft::fft_complex_fwd>(d_fftsize, d_nthreads); - d_invfft = boost::make_unique<fft::fft_complex_rev>(d_fftsize, d_nthreads); + d_fwdfft = std::make_unique<fft::fft_complex_fwd>(d_fftsize, d_nthreads); + d_invfft = std::make_unique<fft::fft_complex_rev>(d_fftsize, d_nthreads); d_xformed_taps.resize(d_fftsize); } } |