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 | |
| parent | 57df09de3a2e27aca42eca621d452f03b15b67b6 (diff) | |
C++14: Use std::make_unique instead of boost::make_unique
Also, clean up includes
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
24 files changed, 77 insertions, 79 deletions
diff --git a/gnuradio-runtime/include/pmt/pmt.h b/gnuradio-runtime/include/pmt/pmt.h index a977a23eaa..ddc53caec9 100644 --- a/gnuradio-runtime/include/pmt/pmt.h +++ b/gnuradio-runtime/include/pmt/pmt.h @@ -80,7 +80,6 @@ public: /*! * \brief typedef for shared pointer (transparent reference counting). - * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm */ typedef std::shared_ptr<pmt_base> pmt_t; diff --git a/gnuradio-runtime/lib/block_executor.cc b/gnuradio-runtime/lib/block_executor.cc index 322c7041b5..e8be9b3ca9 100644 --- a/gnuradio-runtime/lib/block_executor.cc +++ b/gnuradio-runtime/lib/block_executor.cc @@ -21,7 +21,6 @@ #include <block_executor.h> #include <stdio.h> #include <boost/format.hpp> -#include <boost/make_unique.hpp> #include <boost/thread.hpp> #include <iostream> #include <limits> diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc index 18b60b9a47..3ef5974556 100644 --- a/gnuradio-runtime/lib/hier_block2.cc +++ b/gnuradio-runtime/lib/hier_block2.cc @@ -16,8 +16,8 @@ #include <gnuradio/flowgraph.h> #include <gnuradio/hier_block2.h> #include <gnuradio/io_signature.h> -#include <boost/make_unique.hpp> #include <iostream> +#include <memory> namespace gr { @@ -37,7 +37,7 @@ hier_block2::hier_block2(const std::string& name, gr::io_signature::sptr input_signature, gr::io_signature::sptr output_signature) : basic_block(name, input_signature, output_signature), - d_detail(boost::make_unique<hier_block2_detail>(this)), + d_detail(std::make_unique<hier_block2_detail>(this)), hier_message_ports_in(pmt::PMT_NIL), hier_message_ports_out(pmt::PMT_NIL) { diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc index f282ca9276..4dbab39aa0 100644 --- a/gnuradio-runtime/lib/logger.cc +++ b/gnuradio-runtime/lib/logger.cc @@ -20,8 +20,8 @@ #include <gnuradio/logger.h> #include <gnuradio/prefs.h> -#include <boost/make_unique.hpp> #include <algorithm> +#include <memory> #include <stdexcept> namespace gr { @@ -96,7 +96,7 @@ void logger_config::load_config(std::string filename, unsigned int watch_period) logger_configured = logger_load_config(instance.filename); // Start watch if required if (instance.watch_period > 0) { - instance.watch_thread = boost::make_unique<boost::thread>( + instance.watch_thread = std::make_unique<boost::thread>( watch_file, instance.filename, instance.watch_period); } } diff --git a/gnuradio-runtime/lib/thread/thread_group.cc b/gnuradio-runtime/lib/thread/thread_group.cc index 6c7512ab28..c4fcfcd042 100644 --- a/gnuradio-runtime/lib/thread/thread_group.cc +++ b/gnuradio-runtime/lib/thread/thread_group.cc @@ -13,7 +13,7 @@ */ #include <gnuradio/thread/thread_group.h> -#include <boost/make_unique.hpp> +#include <memory> namespace gr { namespace thread { @@ -26,7 +26,7 @@ boost::thread* thread_group::create_thread(const boost::function0<void>& threadf { // No scoped_lock required here since the only "shared data" that's // modified here occurs inside add_thread which does scoped_lock. - auto thrd = boost::make_unique<boost::thread>(threadfunc); + auto thrd = std::make_unique<boost::thread>(threadfunc); auto thrdp = thrd.get(); add_thread(std::move(thrd)); return thrdp; diff --git a/gnuradio-runtime/lib/top_block.cc b/gnuradio-runtime/lib/top_block.cc index c7e0ee74ce..319bb7a0c1 100644 --- a/gnuradio-runtime/lib/top_block.cc +++ b/gnuradio-runtime/lib/top_block.cc @@ -18,8 +18,8 @@ #include <gnuradio/prefs.h> #include <gnuradio/top_block.h> #include <unistd.h> -#include <boost/make_unique.hpp> #include <iostream> +#include <memory> namespace gr { top_block_sptr make_top_block(const std::string& name, bool catch_exceptions) @@ -29,7 +29,7 @@ top_block_sptr make_top_block(const std::string& name, bool catch_exceptions) top_block::top_block(const std::string& name, bool catch_exceptions) : hier_block2(name, io_signature::make(0, 0, 0), io_signature::make(0, 0, 0)), - d_impl(boost::make_unique<top_block_impl>(this, catch_exceptions)) + d_impl(std::make_unique<top_block_impl>(this, catch_exceptions)) { } diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.cc b/gr-analog/lib/ctcss_squelch_ff_impl.cc index 56da0224a6..a6e7f614b2 100644 --- a/gr-analog/lib/ctcss_squelch_ff_impl.cc +++ b/gr-analog/lib/ctcss_squelch_ff_impl.cc @@ -13,7 +13,7 @@ #endif #include "ctcss_squelch_ff_impl.h" -#include <boost/make_unique.hpp> +#include <memory> namespace gr { namespace analog { @@ -88,9 +88,9 @@ ctcss_squelch_ff_impl::ctcss_squelch_ff_impl( float f_l, f_r; compute_freqs(d_freq, f_l, f_r); - d_goertzel_l = boost::make_unique<fft::goertzel>(d_rate, d_len, f_l); - d_goertzel_c = boost::make_unique<fft::goertzel>(d_rate, d_len, freq); - d_goertzel_r = boost::make_unique<fft::goertzel>(d_rate, d_len, f_r); + d_goertzel_l = std::make_unique<fft::goertzel>(d_rate, d_len, f_l); + d_goertzel_c = std::make_unique<fft::goertzel>(d_rate, d_len, freq); + d_goertzel_r = std::make_unique<fft::goertzel>(d_rate, d_len, f_r); } ctcss_squelch_ff_impl::~ctcss_squelch_ff_impl() {} diff --git a/gr-blocks/lib/tcp_server_sink_impl.cc b/gr-blocks/lib/tcp_server_sink_impl.cc index 1cd6c2b14d..ad62269a2c 100644 --- a/gr-blocks/lib/tcp_server_sink_impl.cc +++ b/gr-blocks/lib/tcp_server_sink_impl.cc @@ -20,8 +20,8 @@ #include <boost/array.hpp> #include <boost/asio.hpp> #include <boost/format.hpp> -#include <boost/make_unique.hpp> #include <algorithm> +#include <memory> #include <stdexcept> namespace gr { @@ -57,12 +57,12 @@ tcp_server_sink_impl::tcp_server_sink_impl(size_t itemsize, d_acceptor.listen(); if (!noblock) { - auto sock = boost::make_unique<boost::asio::ip::tcp::socket>(d_io_service); + auto sock = std::make_unique<boost::asio::ip::tcp::socket>(d_io_service); d_acceptor.accept(*sock, d_endpoint); d_sockets.insert(std::move(sock)); } - d_socket = boost::make_unique<boost::asio::ip::tcp::socket>(d_io_service); + d_socket = std::make_unique<boost::asio::ip::tcp::socket>(d_io_service); d_acceptor.async_accept(*d_socket, boost::bind(&tcp_server_sink_impl::do_accept, this, @@ -76,7 +76,7 @@ void tcp_server_sink_impl::do_accept(const boost::system::error_code& error) if (!error) { gr::thread::scoped_lock guard(d_writing_mut); d_sockets.insert(std::move(d_socket)); - d_socket = boost::make_unique<boost::asio::ip::tcp::socket>(d_io_service); + d_socket = std::make_unique<boost::asio::ip::tcp::socket>(d_io_service); d_acceptor.async_accept(*d_socket, boost::bind(&tcp_server_sink_impl::do_accept, this, diff --git a/gr-blocks/lib/udp_sink_impl.cc b/gr-blocks/lib/udp_sink_impl.cc index 3eff348eeb..24370f322d 100644 --- a/gr-blocks/lib/udp_sink_impl.cc +++ b/gr-blocks/lib/udp_sink_impl.cc @@ -20,7 +20,7 @@ #include <boost/array.hpp> #include <boost/asio.hpp> #include <boost/format.hpp> -#include <boost/make_unique.hpp> +#include <memory> #include <stdexcept> namespace gr { @@ -65,7 +65,7 @@ void udp_sink_impl::connect(const std::string& host, int port) host, s_port, boost::asio::ip::resolver_query_base::passive); d_endpoint = *resolver.resolve(query); - d_socket = boost::make_unique<boost::asio::ip::udp::socket>(d_io_service); + d_socket = std::make_unique<boost::asio::ip::udp::socket>(d_io_service); d_socket->open(d_endpoint.protocol()); boost::asio::socket_base::reuse_address roption(true); diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc index e13fc60e3f..fe07e055f2 100644 --- a/gr-blocks/lib/udp_source_impl.cc +++ b/gr-blocks/lib/udp_source_impl.cc @@ -19,7 +19,7 @@ #include <errno.h> #include <stdio.h> #include <string.h> -#include <boost/make_unique.hpp> +#include <memory> #include <stdexcept> namespace gr { @@ -74,7 +74,7 @@ void udp_source_impl::connect(const std::string& host, int port) d_host, s_port, boost::asio::ip::resolver_query_base::passive); d_endpoint = *resolver.resolve(query); - d_socket = boost::make_unique<boost::asio::ip::udp::socket>(d_io_service); + d_socket = std::make_unique<boost::asio::ip::udp::socket>(d_io_service); d_socket->open(d_endpoint.protocol()); boost::asio::socket_base::reuse_address roption(true); diff --git a/gr-digital/lib/decision_feedback_equalizer_impl.cc b/gr-digital/lib/decision_feedback_equalizer_impl.cc index 7f39360999..9178ee4a87 100644 --- a/gr-digital/lib/decision_feedback_equalizer_impl.cc +++ b/gr-digital/lib/decision_feedback_equalizer_impl.cc @@ -16,8 +16,8 @@ #include "decision_feedback_equalizer_impl.h" #include <gnuradio/io_signature.h> #include <volk/volk.h> -#include <boost/smart_ptr/make_unique.hpp> #include <algorithm> +#include <memory> using namespace std; namespace gr { @@ -181,7 +181,7 @@ int decision_feedback_equalizer_impl::equalize( samples = input_samples; } else { in_prepended_history = - boost::make_unique<std::vector<gr_complex>>(num_inputs + d_num_taps_fwd - 1); + std::make_unique<std::vector<gr_complex>>(num_inputs + d_num_taps_fwd - 1); std::copy(input_samples, input_samples + num_inputs, in_prepended_history->begin() + d_num_taps_fwd - 1); diff --git a/gr-digital/lib/interpolating_resampler.cc b/gr-digital/lib/interpolating_resampler.cc index c65df7b098..f1da038a40 100644 --- a/gr-digital/lib/interpolating_resampler.cc +++ b/gr-digital/lib/interpolating_resampler.cc @@ -14,8 +14,8 @@ #include "interpolating_resampler.h" #include <gnuradio/math.h> -#include <boost/make_unique.hpp> #include <deque> +#include <memory> #include <stdexcept> namespace gr { @@ -98,11 +98,11 @@ std::unique_ptr<interpolating_resampler_ccf> interpolating_resampler_ccf::make( { switch (type) { case IR_MMSE_8TAP: - return boost::make_unique<interp_resampler_mmse_8tap_cc>(derivative); + return std::make_unique<interp_resampler_mmse_8tap_cc>(derivative); case IR_PFB_NO_MF: - return boost::make_unique<interp_resampler_pfb_no_mf_cc>(derivative, nfilts); + return std::make_unique<interp_resampler_pfb_no_mf_cc>(derivative, nfilts); case IR_PFB_MF: - return boost::make_unique<interp_resampler_pfb_mf_ccf>(taps, nfilts, derivative); + return std::make_unique<interp_resampler_pfb_mf_ccf>(taps, nfilts, derivative); case IR_NONE: return nullptr; } @@ -117,11 +117,11 @@ std::unique_ptr<interpolating_resampler_fff> interpolating_resampler_fff::make( { switch (type) { case IR_MMSE_8TAP: - return boost::make_unique<interp_resampler_mmse_8tap_ff>(derivative); + return std::make_unique<interp_resampler_mmse_8tap_ff>(derivative); case IR_PFB_NO_MF: - return boost::make_unique<interp_resampler_pfb_no_mf_ff>(derivative, nfilts); + return std::make_unique<interp_resampler_pfb_no_mf_ff>(derivative, nfilts); case IR_PFB_MF: - return boost::make_unique<interp_resampler_pfb_mf_fff>(taps, nfilts, derivative); + return std::make_unique<interp_resampler_pfb_mf_fff>(taps, nfilts, derivative); case IR_NONE: return nullptr; } @@ -135,7 +135,7 @@ interp_resampler_mmse_8tap_cc::interp_resampler_mmse_8tap_cc(bool derivative) : interpolating_resampler_ccf(IR_MMSE_8TAP, derivative) { if (d_derivative) { - d_interp_diff = boost::make_unique<filter::mmse_interp_differentiator_cc>(); + d_interp_diff = std::make_unique<filter::mmse_interp_differentiator_cc>(); } } @@ -161,7 +161,7 @@ interp_resampler_mmse_8tap_ff::interp_resampler_mmse_8tap_ff(bool derivative) : interpolating_resampler_fff(IR_MMSE_8TAP, derivative) { if (d_derivative) { - d_interp_diff = boost::make_unique<filter::mmse_interp_differentiator_ff>(); + d_interp_diff = std::make_unique<filter::mmse_interp_differentiator_ff>(); } } diff --git a/gr-digital/lib/linear_equalizer_impl.cc b/gr-digital/lib/linear_equalizer_impl.cc index 6fbafd203b..f3f9736270 100644 --- a/gr-digital/lib/linear_equalizer_impl.cc +++ b/gr-digital/lib/linear_equalizer_impl.cc @@ -16,7 +16,7 @@ #include <gnuradio/io_signature.h> #include <gnuradio/misc.h> #include <volk/volk.h> -#include <boost/smart_ptr/make_unique.hpp> +#include <memory> #include <vector> #include "adaptive_algorithms.h" @@ -114,7 +114,7 @@ int linear_equalizer_impl::equalize(const gr_complex* input_samples, samples = input_samples; } else { in_prepended_history = - boost::make_unique<std::vector<gr_complex>>(num_inputs + d_num_taps - 1); + std::make_unique<std::vector<gr_complex>>(num_inputs + d_num_taps - 1); std::copy(input_samples, input_samples + num_inputs, in_prepended_history->begin() + d_num_taps - 1); diff --git a/gr-digital/lib/mpsk_snr_est_cc_impl.cc b/gr-digital/lib/mpsk_snr_est_cc_impl.cc index 3501cf1175..b78355efa8 100644 --- a/gr-digital/lib/mpsk_snr_est_cc_impl.cc +++ b/gr-digital/lib/mpsk_snr_est_cc_impl.cc @@ -14,8 +14,8 @@ #include "mpsk_snr_est_cc_impl.h" #include <gnuradio/io_signature.h> -#include <boost/make_unique.hpp> #include <cstdio> +#include <memory> namespace gr { namespace digital { @@ -25,13 +25,13 @@ std::unique_ptr<mpsk_snr_est> choose_type(snr_est_type_t t, double d_alpha) { switch (t) { case (SNR_EST_SIMPLE): - return boost::make_unique<mpsk_snr_est_simple>(d_alpha); + return std::make_unique<mpsk_snr_est_simple>(d_alpha); case (SNR_EST_SKEW): - return boost::make_unique<mpsk_snr_est_skew>(d_alpha); + return std::make_unique<mpsk_snr_est_skew>(d_alpha); case (SNR_EST_M2M4): - return boost::make_unique<mpsk_snr_est_m2m4>(d_alpha); + return std::make_unique<mpsk_snr_est_m2m4>(d_alpha); case (SNR_EST_SVR): - return boost::make_unique<mpsk_snr_est_svr>(d_alpha); + return std::make_unique<mpsk_snr_est_svr>(d_alpha); } throw std::invalid_argument("mpsk_snr_est_cc_impl: unknown type specified."); } diff --git a/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc b/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc index c8f921fa1c..94efb553bb 100644 --- a/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc +++ b/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc @@ -14,8 +14,8 @@ #include "probe_mpsk_snr_est_c_impl.h" #include <gnuradio/io_signature.h> -#include <boost/make_unique.hpp> #include <cstdio> +#include <memory> namespace gr { namespace digital { @@ -25,13 +25,13 @@ std::unique_ptr<mpsk_snr_est> choose_type(snr_est_type_t t, double alpha) { switch (t) { case (SNR_EST_SIMPLE): - return boost::make_unique<mpsk_snr_est_simple>(alpha); + return std::make_unique<mpsk_snr_est_simple>(alpha); case (SNR_EST_SKEW): - return boost::make_unique<mpsk_snr_est_skew>(alpha); + return std::make_unique<mpsk_snr_est_skew>(alpha); case (SNR_EST_M2M4): - return boost::make_unique<mpsk_snr_est_m2m4>(alpha); + return std::make_unique<mpsk_snr_est_m2m4>(alpha); case (SNR_EST_SVR): - return boost::make_unique<mpsk_snr_est_svr>(alpha); + return std::make_unique<mpsk_snr_est_svr>(alpha); } throw std::invalid_argument("probe_mpsk_snr_est_c_impl: unknown type specified."); } diff --git a/gr-digital/lib/timing_error_detector.cc b/gr-digital/lib/timing_error_detector.cc index 52bb063948..e7a95dfc5c 100644 --- a/gr-digital/lib/timing_error_detector.cc +++ b/gr-digital/lib/timing_error_detector.cc @@ -14,7 +14,7 @@ #include "timing_error_detector.h" #include <gnuradio/math.h> -#include <boost/make_unique.hpp> +#include <memory> #include <stdexcept> namespace gr { @@ -27,23 +27,23 @@ timing_error_detector::make(enum ted_type type, constellation_sptr constellation case TED_NONE: return nullptr; case TED_MUELLER_AND_MULLER: - return boost::make_unique<ted_mueller_and_muller>(constellation); + return std::make_unique<ted_mueller_and_muller>(constellation); case TED_MOD_MUELLER_AND_MULLER: - return boost::make_unique<ted_mod_mueller_and_muller>(constellation); + return std::make_unique<ted_mod_mueller_and_muller>(constellation); case TED_ZERO_CROSSING: - return boost::make_unique<ted_zero_crossing>(constellation); + return std::make_unique<ted_zero_crossing>(constellation); case TED_GARDNER: - return boost::make_unique<ted_gardner>(); + return std::make_unique<ted_gardner>(); case TED_EARLY_LATE: - return boost::make_unique<ted_early_late>(); + return std::make_unique<ted_early_late>(); case TED_DANDREA_AND_MENGALI_GEN_MSK: - return boost::make_unique<ted_generalized_msk>(); + return std::make_unique<ted_generalized_msk>(); case TED_SIGNAL_TIMES_SLOPE_ML: - return boost::make_unique<ted_signal_times_slope_ml>(); + return std::make_unique<ted_signal_times_slope_ml>(); case TED_SIGNUM_TIMES_SLOPE_ML: - return boost::make_unique<ted_signum_times_slope_ml>(); + return std::make_unique<ted_signum_times_slope_ml>(); case TED_MENGALI_AND_DANDREA_GMSK: - return boost::make_unique<ted_gaussian_msk>(); + return std::make_unique<ted_gaussian_msk>(); } return nullptr; } diff --git a/gr-fec/lib/polar_decoder_sc_list.cc b/gr-fec/lib/polar_decoder_sc_list.cc index d1071a7d6e..3956f9cbe1 100644 --- a/gr-fec/lib/polar_decoder_sc_list.cc +++ b/gr-fec/lib/polar_decoder_sc_list.cc @@ -16,9 +16,9 @@ #include <gnuradio/fec/polar_decoder_sc_list.h> #include <gnuradio/io_signature.h> #include <volk/volk.h> -#include <boost/make_unique.hpp> #include <algorithm> #include <cmath> +#include <memory> namespace gr { namespace fec { @@ -44,7 +44,7 @@ polar_decoder_sc_list::polar_decoder_sc_list(int max_list_size, std::vector<uint8_t> frozen_bit_values) : polar_decoder_common( block_size, num_info_bits, frozen_bit_positions, frozen_bit_values), - d_scl(boost::make_unique<polar::scl_list>(max_list_size, block_size, block_power())) + d_scl(std::make_unique<polar::scl_list>(max_list_size, block_size, block_power())) { } diff --git a/gr-filter/lib/dc_blocker_cc_impl.cc b/gr-filter/lib/dc_blocker_cc_impl.cc index c3e4fd1b3c..c4c5435db5 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 347cd12b08..2e4f25d03b 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 a9a7bd73e3..7531c23f56 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); } } diff --git a/gr-zeromq/lib/pull_msg_source_impl.cc b/gr-zeromq/lib/pull_msg_source_impl.cc index 56dba69735..06463ef9cd 100644 --- a/gr-zeromq/lib/pull_msg_source_impl.cc +++ b/gr-zeromq/lib/pull_msg_source_impl.cc @@ -16,8 +16,8 @@ #include "tag_headers.h" #include <gnuradio/io_signature.h> #include <boost/date_time/posix_time/posix_time.hpp> -#include <boost/make_unique.hpp> #include <boost/thread/thread.hpp> +#include <memory> namespace gr { namespace zeromq { @@ -60,7 +60,7 @@ pull_msg_source_impl::~pull_msg_source_impl() {} bool pull_msg_source_impl::start() { d_finished = false; - d_thread = boost::make_unique<boost::thread>( + d_thread = std::make_unique<boost::thread>( boost::bind(&pull_msg_source_impl::readloop, this)); return true; } diff --git a/gr-zeromq/lib/rep_msg_sink_impl.cc b/gr-zeromq/lib/rep_msg_sink_impl.cc index 5bb4f3b152..d457e7fae7 100644 --- a/gr-zeromq/lib/rep_msg_sink_impl.cc +++ b/gr-zeromq/lib/rep_msg_sink_impl.cc @@ -15,7 +15,7 @@ #include "rep_msg_sink_impl.h" #include "tag_headers.h" #include <gnuradio/io_signature.h> -#include <boost/make_unique.hpp> +#include <memory> namespace gr { namespace zeromq { @@ -58,8 +58,8 @@ rep_msg_sink_impl::~rep_msg_sink_impl() {} bool rep_msg_sink_impl::start() { d_finished = false; - d_thread = boost::make_unique<boost::thread>( - boost::bind(&rep_msg_sink_impl::readloop, this)); + d_thread = + std::make_unique<boost::thread>(boost::bind(&rep_msg_sink_impl::readloop, this)); return true; } diff --git a/gr-zeromq/lib/req_msg_source_impl.cc b/gr-zeromq/lib/req_msg_source_impl.cc index ff4405cb0e..43a1852f0b 100644 --- a/gr-zeromq/lib/req_msg_source_impl.cc +++ b/gr-zeromq/lib/req_msg_source_impl.cc @@ -16,8 +16,8 @@ #include "tag_headers.h" #include <gnuradio/io_signature.h> #include <boost/date_time/posix_time/posix_time.hpp> -#include <boost/make_unique.hpp> #include <boost/thread/thread.hpp> +#include <memory> namespace gr { namespace zeromq { @@ -60,7 +60,7 @@ req_msg_source_impl::~req_msg_source_impl() {} bool req_msg_source_impl::start() { d_finished = false; - d_thread = boost::make_unique<boost::thread>( + d_thread = std::make_unique<boost::thread>( boost::bind(&req_msg_source_impl::readloop, this)); return true; } diff --git a/gr-zeromq/lib/sub_msg_source_impl.cc b/gr-zeromq/lib/sub_msg_source_impl.cc index 9c4b283097..fd9229fdfd 100644 --- a/gr-zeromq/lib/sub_msg_source_impl.cc +++ b/gr-zeromq/lib/sub_msg_source_impl.cc @@ -16,8 +16,8 @@ #include "tag_headers.h" #include <gnuradio/io_signature.h> #include <boost/date_time/posix_time/posix_time.hpp> -#include <boost/make_unique.hpp> #include <boost/thread/thread.hpp> +#include <memory> namespace gr { namespace zeromq { @@ -59,7 +59,7 @@ sub_msg_source_impl::~sub_msg_source_impl() {} bool sub_msg_source_impl::start() { d_finished = false; - d_thread = boost::make_unique<boost::thread>( + d_thread = std::make_unique<boost::thread>( boost::bind(&sub_msg_source_impl::readloop, this)); return true; } |