diff options
| author | Thomas Habets <thomas@habets.se> | 2020-05-03 12:23:51 +0100 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2020-07-30 18:12:44 +0200 |
| commit | 30643f01609e915296023adc37123e27e2c86d3f (patch) | |
| tree | caf7141e8091cd30cde4e75ef0d1fcc5454ace77 /gr-digital | |
| parent | 875148321bca3c39af9aec8dee3c24eb9f75d1e6 (diff) | |
Replace all calls to `get_initial_sptr` with `make_block_sptr`
First batch of changes:
```
find […] -print0 | xargs -0 sed -i -r '/get_initial_sptr/{:nxt N;/;/!b nxt;s/get_initial_sptr\(\s*new ([^(]+)(.*)\)\)/make_block_sptr<\1>\2)/}'
```
Then:
* Back out `sptr_magic.h` edits
* Change some `friend` clauses
* clang-format the whole thing
* Update checksums in the pybind11 bindings files
Diffstat (limited to 'gr-digital')
61 files changed, 153 insertions, 162 deletions
diff --git a/gr-digital/lib/additive_scrambler_bb_impl.cc b/gr-digital/lib/additive_scrambler_bb_impl.cc index c7562e209d..a701700b72 100644 --- a/gr-digital/lib/additive_scrambler_bb_impl.cc +++ b/gr-digital/lib/additive_scrambler_bb_impl.cc @@ -25,8 +25,8 @@ additive_scrambler_bb::sptr additive_scrambler_bb::make(int mask, int bits_per_byte, const std::string& reset_tag_key) { - return gnuradio::get_initial_sptr(new additive_scrambler_bb_impl( - mask, seed, len, count, bits_per_byte, reset_tag_key)); + return gnuradio::make_block_sptr<additive_scrambler_bb_impl>( + mask, seed, len, count, bits_per_byte, reset_tag_key); } additive_scrambler_bb_impl::additive_scrambler_bb_impl(int mask, diff --git a/gr-digital/lib/binary_slicer_fb_impl.cc b/gr-digital/lib/binary_slicer_fb_impl.cc index c628d7fd10..86361629ac 100644 --- a/gr-digital/lib/binary_slicer_fb_impl.cc +++ b/gr-digital/lib/binary_slicer_fb_impl.cc @@ -22,7 +22,7 @@ namespace digital { binary_slicer_fb::sptr binary_slicer_fb::make() { - return gnuradio::get_initial_sptr(new binary_slicer_fb_impl()); + return gnuradio::make_block_sptr<binary_slicer_fb_impl>(); } binary_slicer_fb_impl::binary_slicer_fb_impl() diff --git a/gr-digital/lib/burst_shaper_impl.cc b/gr-digital/lib/burst_shaper_impl.cc index c2abadbd6b..bf403a08b0 100644 --- a/gr-digital/lib/burst_shaper_impl.cc +++ b/gr-digital/lib/burst_shaper_impl.cc @@ -28,8 +28,8 @@ typename burst_shaper<T>::sptr burst_shaper<T>::make(const std::vector<T>& taps, bool insert_phasing, const std::string& length_tag_name) { - return gnuradio::get_initial_sptr(new burst_shaper_impl<T>( - taps, pre_padding, post_padding, insert_phasing, length_tag_name)); + return gnuradio::make_block_sptr<burst_shaper_impl<T>>( + taps, pre_padding, post_padding, insert_phasing, length_tag_name); } template <class T> diff --git a/gr-digital/lib/chunks_to_symbols_impl.cc b/gr-digital/lib/chunks_to_symbols_impl.cc index 2c582b0334..de84eb98a5 100644 --- a/gr-digital/lib/chunks_to_symbols_impl.cc +++ b/gr-digital/lib/chunks_to_symbols_impl.cc @@ -40,8 +40,8 @@ template <class IN_T, class OUT_T> typename chunks_to_symbols<IN_T, OUT_T>::sptr chunks_to_symbols<IN_T, OUT_T>::make(const std::vector<OUT_T>& symbol_table, const int D) { - return gnuradio::get_initial_sptr( - new chunks_to_symbols_impl<IN_T, OUT_T>(symbol_table, D)); + return gnuradio::make_block_sptr<chunks_to_symbols_impl<IN_T, OUT_T>>(symbol_table, + D); } template <class IN_T, class OUT_T> diff --git a/gr-digital/lib/clock_recovery_mm_cc_impl.cc b/gr-digital/lib/clock_recovery_mm_cc_impl.cc index 4f2f4c0c58..be97143367 100644 --- a/gr-digital/lib/clock_recovery_mm_cc_impl.cc +++ b/gr-digital/lib/clock_recovery_mm_cc_impl.cc @@ -28,8 +28,8 @@ static const int FUDGE = 16; clock_recovery_mm_cc::sptr clock_recovery_mm_cc::make( float omega, float gain_omega, float mu, float gain_mu, float omega_relative_limit) { - return gnuradio::get_initial_sptr(new clock_recovery_mm_cc_impl( - omega, gain_omega, mu, gain_mu, omega_relative_limit)); + return gnuradio::make_block_sptr<clock_recovery_mm_cc_impl>( + omega, gain_omega, mu, gain_mu, omega_relative_limit); } clock_recovery_mm_cc_impl::clock_recovery_mm_cc_impl( diff --git a/gr-digital/lib/clock_recovery_mm_ff_impl.cc b/gr-digital/lib/clock_recovery_mm_ff_impl.cc index ceff90a8e5..652a1fcfa2 100644 --- a/gr-digital/lib/clock_recovery_mm_ff_impl.cc +++ b/gr-digital/lib/clock_recovery_mm_ff_impl.cc @@ -23,8 +23,8 @@ namespace digital { clock_recovery_mm_ff::sptr clock_recovery_mm_ff::make( float omega, float gain_omega, float mu, float gain_mu, float omega_relative_limit) { - return gnuradio::get_initial_sptr(new clock_recovery_mm_ff_impl( - omega, gain_omega, mu, gain_mu, omega_relative_limit)); + return gnuradio::make_block_sptr<clock_recovery_mm_ff_impl>( + omega, gain_omega, mu, gain_mu, omega_relative_limit); } clock_recovery_mm_ff_impl::clock_recovery_mm_ff_impl( diff --git a/gr-digital/lib/cma_equalizer_cc_impl.cc b/gr-digital/lib/cma_equalizer_cc_impl.cc index f38a50ea43..a44d80d581 100644 --- a/gr-digital/lib/cma_equalizer_cc_impl.cc +++ b/gr-digital/lib/cma_equalizer_cc_impl.cc @@ -23,8 +23,7 @@ using namespace filter::kernel; cma_equalizer_cc::sptr cma_equalizer_cc::make(int num_taps, float modulus, float mu, int sps) { - return gnuradio::get_initial_sptr( - new cma_equalizer_cc_impl(num_taps, modulus, mu, sps)); + return gnuradio::make_block_sptr<cma_equalizer_cc_impl>(num_taps, modulus, mu, sps); } cma_equalizer_cc_impl::cma_equalizer_cc_impl(int num_taps, diff --git a/gr-digital/lib/constellation_decoder_cb_impl.cc b/gr-digital/lib/constellation_decoder_cb_impl.cc index a1c35d273f..cfbf370215 100644 --- a/gr-digital/lib/constellation_decoder_cb_impl.cc +++ b/gr-digital/lib/constellation_decoder_cb_impl.cc @@ -21,7 +21,7 @@ namespace digital { constellation_decoder_cb::sptr constellation_decoder_cb::make(constellation_sptr constellation) { - return gnuradio::get_initial_sptr(new constellation_decoder_cb_impl(constellation)); + return gnuradio::make_block_sptr<constellation_decoder_cb_impl>(constellation); } constellation_decoder_cb_impl::constellation_decoder_cb_impl( diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc index 7cb9da68e3..922ff410fb 100644 --- a/gr-digital/lib/constellation_receiver_cb_impl.cc +++ b/gr-digital/lib/constellation_receiver_cb_impl.cc @@ -28,8 +28,8 @@ namespace digital { constellation_receiver_cb::sptr constellation_receiver_cb::make( constellation_sptr constell, float loop_bw, float fmin, float fmax) { - return gnuradio::get_initial_sptr( - new constellation_receiver_cb_impl(constell, loop_bw, fmin, fmax)); + return gnuradio::make_block_sptr<constellation_receiver_cb_impl>( + constell, loop_bw, fmin, fmax); } static const std::vector<int> iosig = { diff --git a/gr-digital/lib/constellation_soft_decoder_cf_impl.cc b/gr-digital/lib/constellation_soft_decoder_cf_impl.cc index dd52840067..0cb12975a1 100644 --- a/gr-digital/lib/constellation_soft_decoder_cf_impl.cc +++ b/gr-digital/lib/constellation_soft_decoder_cf_impl.cc @@ -21,8 +21,7 @@ namespace digital { constellation_soft_decoder_cf::sptr constellation_soft_decoder_cf::make(constellation_sptr constellation) { - return gnuradio::get_initial_sptr( - new constellation_soft_decoder_cf_impl(constellation)); + return gnuradio::make_block_sptr<constellation_soft_decoder_cf_impl>(constellation); } constellation_soft_decoder_cf_impl::constellation_soft_decoder_cf_impl( diff --git a/gr-digital/lib/corr_est_cc_impl.cc b/gr-digital/lib/corr_est_cc_impl.cc index e9137d2c15..b5ecbab2b1 100644 --- a/gr-digital/lib/corr_est_cc_impl.cc +++ b/gr-digital/lib/corr_est_cc_impl.cc @@ -30,8 +30,8 @@ corr_est_cc::sptr corr_est_cc::make(const std::vector<gr_complex>& symbols, float threshold, tm_type threshold_method) { - return gnuradio::get_initial_sptr( - new corr_est_cc_impl(symbols, sps, mark_delay, threshold, threshold_method)); + return gnuradio::make_block_sptr<corr_est_cc_impl>( + symbols, sps, mark_delay, threshold, threshold_method); } corr_est_cc_impl::corr_est_cc_impl(const std::vector<gr_complex>& symbols, diff --git a/gr-digital/lib/correlate_access_code_bb_impl.cc b/gr-digital/lib/correlate_access_code_bb_impl.cc index a11cdb3087..46a651b494 100644 --- a/gr-digital/lib/correlate_access_code_bb_impl.cc +++ b/gr-digital/lib/correlate_access_code_bb_impl.cc @@ -25,8 +25,8 @@ namespace digital { correlate_access_code_bb::sptr correlate_access_code_bb::make(const std::string& access_code, int threshold) { - return gnuradio::get_initial_sptr( - new correlate_access_code_bb_impl(access_code, threshold)); + return gnuradio::make_block_sptr<correlate_access_code_bb_impl>(access_code, + threshold); } correlate_access_code_bb_impl::correlate_access_code_bb_impl( diff --git a/gr-digital/lib/correlate_access_code_bb_ts_impl.cc b/gr-digital/lib/correlate_access_code_bb_ts_impl.cc index fcf974748e..0312defe11 100644 --- a/gr-digital/lib/correlate_access_code_bb_ts_impl.cc +++ b/gr-digital/lib/correlate_access_code_bb_ts_impl.cc @@ -26,8 +26,8 @@ namespace digital { correlate_access_code_bb_ts::sptr correlate_access_code_bb_ts::make( const std::string& access_code, int threshold, const std::string& tag_name) { - return gnuradio::get_initial_sptr( - new correlate_access_code_bb_ts_impl(access_code, threshold, tag_name)); + return gnuradio::make_block_sptr<correlate_access_code_bb_ts_impl>( + access_code, threshold, tag_name); } diff --git a/gr-digital/lib/correlate_access_code_ff_ts_impl.cc b/gr-digital/lib/correlate_access_code_ff_ts_impl.cc index 26b1e8696e..a78b924caa 100644 --- a/gr-digital/lib/correlate_access_code_ff_ts_impl.cc +++ b/gr-digital/lib/correlate_access_code_ff_ts_impl.cc @@ -27,8 +27,8 @@ namespace digital { correlate_access_code_ff_ts::sptr correlate_access_code_ff_ts::make( const std::string& access_code, int threshold, const std::string& tag_name) { - return gnuradio::get_initial_sptr( - new correlate_access_code_ff_ts_impl(access_code, threshold, tag_name)); + return gnuradio::make_block_sptr<correlate_access_code_ff_ts_impl>( + access_code, threshold, tag_name); } correlate_access_code_ff_ts_impl::correlate_access_code_ff_ts_impl( diff --git a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc index 84b70fe5b5..8794edbae1 100644 --- a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc +++ b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc @@ -26,8 +26,8 @@ namespace digital { correlate_access_code_tag_bb::sptr correlate_access_code_tag_bb::make( const std::string& access_code, int threshold, const std::string& tag_name) { - return gnuradio::get_initial_sptr( - new correlate_access_code_tag_bb_impl(access_code, threshold, tag_name)); + return gnuradio::make_block_sptr<correlate_access_code_tag_bb_impl>( + access_code, threshold, tag_name); } diff --git a/gr-digital/lib/correlate_access_code_tag_ff_impl.cc b/gr-digital/lib/correlate_access_code_tag_ff_impl.cc index 4629416c18..ee41af6724 100644 --- a/gr-digital/lib/correlate_access_code_tag_ff_impl.cc +++ b/gr-digital/lib/correlate_access_code_tag_ff_impl.cc @@ -27,8 +27,8 @@ namespace digital { correlate_access_code_tag_ff::sptr correlate_access_code_tag_ff::make( const std::string& access_code, int threshold, const std::string& tag_name) { - return gnuradio::get_initial_sptr( - new correlate_access_code_tag_ff_impl(access_code, threshold, tag_name)); + return gnuradio::make_block_sptr<correlate_access_code_tag_ff_impl>( + access_code, threshold, tag_name); } diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc index 704f120a1a..94ed87fa10 100644 --- a/gr-digital/lib/costas_loop_cc_impl.cc +++ b/gr-digital/lib/costas_loop_cc_impl.cc @@ -24,7 +24,7 @@ namespace digital { costas_loop_cc::sptr costas_loop_cc::make(float loop_bw, unsigned int order, bool use_snr) { - return gnuradio::get_initial_sptr(new costas_loop_cc_impl(loop_bw, order, use_snr)); + return gnuradio::make_block_sptr<costas_loop_cc_impl>(loop_bw, order, use_snr); } static int ios[] = { sizeof(gr_complex), sizeof(float), sizeof(float), sizeof(float) }; diff --git a/gr-digital/lib/cpmmod_bc_impl.cc b/gr-digital/lib/cpmmod_bc_impl.cc index ff92b61341..1506142b37 100644 --- a/gr-digital/lib/cpmmod_bc_impl.cc +++ b/gr-digital/lib/cpmmod_bc_impl.cc @@ -20,14 +20,14 @@ namespace digital { cpmmod_bc::sptr cpmmod_bc::make( analog::cpm::cpm_type type, float h, int samples_per_sym, int L, double beta) { - return gnuradio::get_initial_sptr(new cpmmod_bc_impl( - "cpmmod_bc", (analog::cpm::cpm_type)type, h, samples_per_sym, L, beta)); + return gnuradio::make_block_sptr<cpmmod_bc_impl>( + "cpmmod_bc", (analog::cpm::cpm_type)type, h, samples_per_sym, L, beta); } cpmmod_bc::sptr cpmmod_bc::make_gmskmod_bc(int samples_per_sym, int L, double beta) { - return gnuradio::get_initial_sptr(new cpmmod_bc_impl( - "gmskmod_bc", analog::cpm::GAUSSIAN, 0.5, samples_per_sym, L, beta)); + return gnuradio::make_block_sptr<cpmmod_bc_impl>( + "gmskmod_bc", analog::cpm::GAUSSIAN, 0.5, samples_per_sym, L, beta); } cpmmod_bc_impl::cpmmod_bc_impl(const std::string& name, diff --git a/gr-digital/lib/crc32_async_bb_impl.cc b/gr-digital/lib/crc32_async_bb_impl.cc index d608d617f3..90851f7b72 100644 --- a/gr-digital/lib/crc32_async_bb_impl.cc +++ b/gr-digital/lib/crc32_async_bb_impl.cc @@ -21,7 +21,7 @@ namespace digital { crc32_async_bb::sptr crc32_async_bb::make(bool check) { - return gnuradio::get_initial_sptr(new crc32_async_bb_impl(check)); + return gnuradio::make_block_sptr<crc32_async_bb_impl>(check); } crc32_async_bb_impl::crc32_async_bb_impl(bool check) diff --git a/gr-digital/lib/crc32_bb_impl.cc b/gr-digital/lib/crc32_bb_impl.cc index 3b8243ce9d..ce1a68a168 100644 --- a/gr-digital/lib/crc32_bb_impl.cc +++ b/gr-digital/lib/crc32_bb_impl.cc @@ -20,7 +20,7 @@ namespace digital { crc32_bb::sptr crc32_bb::make(bool check, const std::string& lengthtagname, bool packed) { - return gnuradio::get_initial_sptr(new crc32_bb_impl(check, lengthtagname, packed)); + return gnuradio::make_block_sptr<crc32_bb_impl>(check, lengthtagname, packed); } crc32_bb_impl::crc32_bb_impl(bool check, const std::string& lengthtagname, bool packed) diff --git a/gr-digital/lib/decision_feedback_equalizer_impl.cc b/gr-digital/lib/decision_feedback_equalizer_impl.cc index 57e1b29116..323692628f 100644 --- a/gr-digital/lib/decision_feedback_equalizer_impl.cc +++ b/gr-digital/lib/decision_feedback_equalizer_impl.cc @@ -32,14 +32,14 @@ decision_feedback_equalizer::make(unsigned num_taps_forward, std::vector<gr_complex> training_sequence, const std::string& training_start_tag) { - return gnuradio::get_initial_sptr( - new decision_feedback_equalizer_impl(num_taps_forward, - num_taps_feedback, - sps, - alg, - adapt_after_training, - training_sequence, - training_start_tag)); + return gnuradio::make_block_sptr<decision_feedback_equalizer_impl>( + num_taps_forward, + num_taps_feedback, + sps, + alg, + adapt_after_training, + training_sequence, + training_start_tag); } /* diff --git a/gr-digital/lib/descrambler_bb_impl.cc b/gr-digital/lib/descrambler_bb_impl.cc index d10d6a0199..b0d875f6a2 100644 --- a/gr-digital/lib/descrambler_bb_impl.cc +++ b/gr-digital/lib/descrambler_bb_impl.cc @@ -20,7 +20,7 @@ namespace digital { descrambler_bb::sptr descrambler_bb::make(int mask, int seed, int len) { - return gnuradio::get_initial_sptr(new descrambler_bb_impl(mask, seed, len)); + return gnuradio::make_block_sptr<descrambler_bb_impl>(mask, seed, len); } descrambler_bb_impl::descrambler_bb_impl(int mask, int seed, int len) diff --git a/gr-digital/lib/diff_decoder_bb_impl.cc b/gr-digital/lib/diff_decoder_bb_impl.cc index 677385ac83..95e5c2e9c3 100644 --- a/gr-digital/lib/diff_decoder_bb_impl.cc +++ b/gr-digital/lib/diff_decoder_bb_impl.cc @@ -19,7 +19,7 @@ namespace gr { namespace digital { diff_decoder_bb::sptr diff_decoder_bb::make(unsigned int modulus) { - return gnuradio::get_initial_sptr(new diff_decoder_bb_impl(modulus)); + return gnuradio::make_block_sptr<diff_decoder_bb_impl>(modulus); } diff_decoder_bb_impl::diff_decoder_bb_impl(unsigned int modulus) diff --git a/gr-digital/lib/diff_encoder_bb_impl.cc b/gr-digital/lib/diff_encoder_bb_impl.cc index 2601e2edd7..fb14504bc2 100644 --- a/gr-digital/lib/diff_encoder_bb_impl.cc +++ b/gr-digital/lib/diff_encoder_bb_impl.cc @@ -20,7 +20,7 @@ namespace digital { diff_encoder_bb::sptr diff_encoder_bb::make(unsigned int modulus) { - return gnuradio::get_initial_sptr(new diff_encoder_bb_impl(modulus)); + return gnuradio::make_block_sptr<diff_encoder_bb_impl>(modulus); } diff_encoder_bb_impl::diff_encoder_bb_impl(unsigned int modulus) diff --git a/gr-digital/lib/diff_phasor_cc_impl.cc b/gr-digital/lib/diff_phasor_cc_impl.cc index 9fbbc4f6f8..df0b2d174c 100644 --- a/gr-digital/lib/diff_phasor_cc_impl.cc +++ b/gr-digital/lib/diff_phasor_cc_impl.cc @@ -20,7 +20,7 @@ namespace digital { diff_phasor_cc::sptr diff_phasor_cc::make() { - return gnuradio::get_initial_sptr(new diff_phasor_cc_impl()); + return gnuradio::make_block_sptr<diff_phasor_cc_impl>(); } diff_phasor_cc_impl::diff_phasor_cc_impl() diff --git a/gr-digital/lib/fll_band_edge_cc_impl.cc b/gr-digital/lib/fll_band_edge_cc_impl.cc index 5fae4dec29..17a8796ef1 100644 --- a/gr-digital/lib/fll_band_edge_cc_impl.cc +++ b/gr-digital/lib/fll_band_edge_cc_impl.cc @@ -35,8 +35,8 @@ fll_band_edge_cc::sptr fll_band_edge_cc::make(float samps_per_sym, int filter_size, float bandwidth) { - return gnuradio::get_initial_sptr( - new fll_band_edge_cc_impl(samps_per_sym, rolloff, filter_size, bandwidth)); + return gnuradio::make_block_sptr<fll_band_edge_cc_impl>( + samps_per_sym, rolloff, filter_size, bandwidth); } static int ios[] = { sizeof(gr_complex), sizeof(float), sizeof(float), sizeof(float) }; diff --git a/gr-digital/lib/framer_sink_1_impl.cc b/gr-digital/lib/framer_sink_1_impl.cc index 37d2210e06..848441b18a 100644 --- a/gr-digital/lib/framer_sink_1_impl.cc +++ b/gr-digital/lib/framer_sink_1_impl.cc @@ -52,7 +52,7 @@ inline void framer_sink_1_impl::enter_have_header(int payload_len, int whitener_ framer_sink_1::sptr framer_sink_1::make(msg_queue::sptr target_queue) { - return gnuradio::get_initial_sptr(new framer_sink_1_impl(target_queue)); + return gnuradio::make_block_sptr<framer_sink_1_impl>(target_queue); } framer_sink_1_impl::framer_sink_1_impl(msg_queue::sptr target_queue) diff --git a/gr-digital/lib/glfsr_source_b_impl.cc b/gr-digital/lib/glfsr_source_b_impl.cc index 23a372278b..f10eafb71c 100644 --- a/gr-digital/lib/glfsr_source_b_impl.cc +++ b/gr-digital/lib/glfsr_source_b_impl.cc @@ -22,8 +22,7 @@ namespace digital { glfsr_source_b::sptr glfsr_source_b::make(unsigned int degree, bool repeat, uint32_t mask, uint32_t seed) { - return gnuradio::get_initial_sptr( - new glfsr_source_b_impl(degree, repeat, mask, seed)); + return gnuradio::make_block_sptr<glfsr_source_b_impl>(degree, repeat, mask, seed); } glfsr_source_b_impl::glfsr_source_b_impl(unsigned int degree, diff --git a/gr-digital/lib/glfsr_source_f_impl.cc b/gr-digital/lib/glfsr_source_f_impl.cc index b92a50ec40..ad4fc96fd2 100644 --- a/gr-digital/lib/glfsr_source_f_impl.cc +++ b/gr-digital/lib/glfsr_source_f_impl.cc @@ -23,8 +23,7 @@ namespace digital { glfsr_source_f::sptr glfsr_source_f::make(unsigned int degree, bool repeat, uint32_t mask, uint32_t seed) { - return gnuradio::get_initial_sptr( - new glfsr_source_f_impl(degree, repeat, mask, seed)); + return gnuradio::make_block_sptr<glfsr_source_f_impl>(degree, repeat, mask, seed); } glfsr_source_f_impl::glfsr_source_f_impl(unsigned int degree, diff --git a/gr-digital/lib/hdlc_deframer_bp_impl.cc b/gr-digital/lib/hdlc_deframer_bp_impl.cc index 653a9a0350..3ceba38281 100644 --- a/gr-digital/lib/hdlc_deframer_bp_impl.cc +++ b/gr-digital/lib/hdlc_deframer_bp_impl.cc @@ -21,7 +21,7 @@ namespace digital { hdlc_deframer_bp::sptr hdlc_deframer_bp::make(int length_min = 32, int length_max = 500) { - return gnuradio::get_initial_sptr(new hdlc_deframer_bp_impl(length_min, length_max)); + return gnuradio::make_block_sptr<hdlc_deframer_bp_impl>(length_min, length_max); } /* diff --git a/gr-digital/lib/hdlc_framer_pb_impl.cc b/gr-digital/lib/hdlc_framer_pb_impl.cc index 10355fce60..c6c120dd09 100644 --- a/gr-digital/lib/hdlc_framer_pb_impl.cc +++ b/gr-digital/lib/hdlc_framer_pb_impl.cc @@ -22,7 +22,7 @@ namespace digital { hdlc_framer_pb::sptr hdlc_framer_pb::make(const std::string frame_tag_name) { - return gnuradio::get_initial_sptr(new hdlc_framer_pb_impl(frame_tag_name)); + return gnuradio::make_block_sptr<hdlc_framer_pb_impl>(frame_tag_name); } /* diff --git a/gr-digital/lib/header_payload_demux_impl.cc b/gr-digital/lib/header_payload_demux_impl.cc index 5bca908038..6826b1e71f 100644 --- a/gr-digital/lib/header_payload_demux_impl.cc +++ b/gr-digital/lib/header_payload_demux_impl.cc @@ -66,17 +66,17 @@ header_payload_demux::make(int header_len, const std::vector<std::string>& special_tags, const size_t header_padding) { - return gnuradio::get_initial_sptr(new header_payload_demux_impl(header_len, - items_per_symbol, - guard_interval, - length_tag_key, - trigger_tag_key, - output_symbols, - itemsize, - timing_tag_key, - samp_rate, - special_tags, - header_padding)); + return gnuradio::make_block_sptr<header_payload_demux_impl>(header_len, + items_per_symbol, + guard_interval, + length_tag_key, + trigger_tag_key, + output_symbols, + itemsize, + timing_tag_key, + samp_rate, + special_tags, + header_padding); } header_payload_demux_impl::header_payload_demux_impl( diff --git a/gr-digital/lib/kurtotic_equalizer_cc_impl.cc b/gr-digital/lib/kurtotic_equalizer_cc_impl.cc index 34b32e62bf..a80c4dc451 100644 --- a/gr-digital/lib/kurtotic_equalizer_cc_impl.cc +++ b/gr-digital/lib/kurtotic_equalizer_cc_impl.cc @@ -21,7 +21,7 @@ namespace digital { kurtotic_equalizer_cc::sptr kurtotic_equalizer_cc::make(int num_taps, float mu) { - return gnuradio::get_initial_sptr(new kurtotic_equalizer_cc_impl(num_taps, mu)); + return gnuradio::make_block_sptr<kurtotic_equalizer_cc_impl>(num_taps, mu); } kurtotic_equalizer_cc_impl::kurtotic_equalizer_cc_impl(int num_taps, float mu) diff --git a/gr-digital/lib/linear_equalizer_impl.cc b/gr-digital/lib/linear_equalizer_impl.cc index 25058bd90a..747e935fc3 100644 --- a/gr-digital/lib/linear_equalizer_impl.cc +++ b/gr-digital/lib/linear_equalizer_impl.cc @@ -34,8 +34,8 @@ linear_equalizer::sptr linear_equalizer::make(unsigned num_taps, std::vector<gr_complex> training_sequence, const std::string& training_start_tag) { - return gnuradio::get_initial_sptr(new linear_equalizer_impl( - num_taps, sps, alg, adapt_after_training, training_sequence, training_start_tag)); + return gnuradio::make_block_sptr<linear_equalizer_impl>( + num_taps, sps, alg, adapt_after_training, training_sequence, training_start_tag); } /* diff --git a/gr-digital/lib/lms_dd_equalizer_cc_impl.cc b/gr-digital/lib/lms_dd_equalizer_cc_impl.cc index 0f76c0745e..33fccb5757 100644 --- a/gr-digital/lib/lms_dd_equalizer_cc_impl.cc +++ b/gr-digital/lib/lms_dd_equalizer_cc_impl.cc @@ -25,8 +25,7 @@ using namespace filter::kernel; lms_dd_equalizer_cc::sptr lms_dd_equalizer_cc::make(int num_taps, float mu, int sps, constellation_sptr cnst) { - return gnuradio::get_initial_sptr( - new lms_dd_equalizer_cc_impl(num_taps, mu, sps, cnst)); + return gnuradio::make_block_sptr<lms_dd_equalizer_cc_impl>(num_taps, mu, sps, cnst); } lms_dd_equalizer_cc_impl::lms_dd_equalizer_cc_impl(int num_taps, diff --git a/gr-digital/lib/map_bb_impl.cc b/gr-digital/lib/map_bb_impl.cc index 3af39e061b..d1f5b134f1 100644 --- a/gr-digital/lib/map_bb_impl.cc +++ b/gr-digital/lib/map_bb_impl.cc @@ -20,7 +20,7 @@ namespace digital { map_bb::sptr map_bb::make(const std::vector<int>& map) { - return gnuradio::get_initial_sptr(new map_bb_impl(map)); + return gnuradio::make_block_sptr<map_bb_impl>(map); } map_bb_impl::map_bb_impl(const std::vector<int>& map) diff --git a/gr-digital/lib/meas_evm_cc_impl.cc b/gr-digital/lib/meas_evm_cc_impl.cc index 85d74cf358..78be5e41ec 100644 --- a/gr-digital/lib/meas_evm_cc_impl.cc +++ b/gr-digital/lib/meas_evm_cc_impl.cc @@ -21,7 +21,7 @@ namespace digital { meas_evm_cc::sptr meas_evm_cc::make(constellation_sptr cons, evm_measurement_t meas_type) { - return gnuradio::get_initial_sptr(new meas_evm_cc_impl(cons, meas_type)); + return gnuradio::make_block_sptr<meas_evm_cc_impl>(cons, meas_type); } meas_evm_cc_impl::meas_evm_cc_impl(constellation_sptr cons, evm_measurement_t meas_type) diff --git a/gr-digital/lib/mpsk_snr_est_cc_impl.cc b/gr-digital/lib/mpsk_snr_est_cc_impl.cc index f2d1ef4b09..3fbd63676c 100644 --- a/gr-digital/lib/mpsk_snr_est_cc_impl.cc +++ b/gr-digital/lib/mpsk_snr_est_cc_impl.cc @@ -22,8 +22,7 @@ namespace digital { mpsk_snr_est_cc::sptr mpsk_snr_est_cc::make(snr_est_type_t type, int tag_nsamples, double alpha) { - return gnuradio::get_initial_sptr( - new mpsk_snr_est_cc_impl(type, tag_nsamples, alpha)); + return gnuradio::make_block_sptr<mpsk_snr_est_cc_impl>(type, tag_nsamples, alpha); } mpsk_snr_est_cc_impl::mpsk_snr_est_cc_impl(snr_est_type_t type, diff --git a/gr-digital/lib/msk_timing_recovery_cc_impl.cc b/gr-digital/lib/msk_timing_recovery_cc_impl.cc index 81d08f4b46..567e9b38c1 100644 --- a/gr-digital/lib/msk_timing_recovery_cc_impl.cc +++ b/gr-digital/lib/msk_timing_recovery_cc_impl.cc @@ -23,8 +23,7 @@ namespace digital { msk_timing_recovery_cc::sptr msk_timing_recovery_cc::make(float sps, float gain, float limit, int osps = 1) { - return gnuradio::get_initial_sptr( - new msk_timing_recovery_cc_impl(sps, gain, limit, osps)); + return gnuradio::make_block_sptr<msk_timing_recovery_cc_impl>(sps, gain, limit, osps); } /* diff --git a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc index 36d3d455f0..21b1c7d2d5 100644 --- a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc +++ b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc @@ -27,14 +27,13 @@ ofdm_carrier_allocator_cvc::sptr ofdm_carrier_allocator_cvc::make( const std::string& len_tag_key, const bool output_is_shifted) { - return gnuradio::get_initial_sptr( - new ofdm_carrier_allocator_cvc_impl(fft_len, - occupied_carriers, - pilot_carriers, - pilot_symbols, - sync_words, - len_tag_key, - output_is_shifted)); + return gnuradio::make_block_sptr<ofdm_carrier_allocator_cvc_impl>(fft_len, + occupied_carriers, + pilot_carriers, + pilot_symbols, + sync_words, + len_tag_key, + output_is_shifted); } ofdm_carrier_allocator_cvc_impl::ofdm_carrier_allocator_cvc_impl( diff --git a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc index 1ca9eb25d8..511266f62e 100644 --- a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc +++ b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc @@ -26,12 +26,12 @@ ofdm_chanest_vcvc::make(const std::vector<gr_complex>& sync_symbol1, int max_carr_offset, bool force_one_sync_symbol) { - return gnuradio::get_initial_sptr(new ofdm_chanest_vcvc_impl(sync_symbol1, - sync_symbol2, - n_data_symbols, - eq_noise_red_len, - max_carr_offset, - force_one_sync_symbol)); + return gnuradio::make_block_sptr<ofdm_chanest_vcvc_impl>(sync_symbol1, + sync_symbol2, + n_data_symbols, + eq_noise_red_len, + max_carr_offset, + force_one_sync_symbol); } ofdm_chanest_vcvc_impl::ofdm_chanest_vcvc_impl( diff --git a/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc b/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc index 8cb8a2199c..cb05338b1f 100644 --- a/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc +++ b/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc @@ -27,8 +27,8 @@ ofdm_cyclic_prefixer::sptr ofdm_cyclic_prefixer::make(size_t input_size, int fft_len = input_size; std::vector<int> cp_lengths( 1, static_cast<int>(output_size - input_size)); // Cast to silence compiler :( - return gnuradio::get_initial_sptr( - new ofdm_cyclic_prefixer_impl(fft_len, cp_lengths, rolloff_len, len_tag_key)); + return gnuradio::make_block_sptr<ofdm_cyclic_prefixer_impl>( + fft_len, cp_lengths, rolloff_len, len_tag_key); } ofdm_cyclic_prefixer::sptr ofdm_cyclic_prefixer::make(int fft_len, @@ -36,8 +36,8 @@ ofdm_cyclic_prefixer::sptr ofdm_cyclic_prefixer::make(int fft_len, int rolloff_len, const std::string& len_tag_key) { - return gnuradio::get_initial_sptr( - new ofdm_cyclic_prefixer_impl(fft_len, cp_lengths, rolloff_len, len_tag_key)); + return gnuradio::make_block_sptr<ofdm_cyclic_prefixer_impl>( + fft_len, cp_lengths, rolloff_len, len_tag_key); } ofdm_cyclic_prefixer_impl::ofdm_cyclic_prefixer_impl(int fft_len, diff --git a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc index ca2f0aa9d3..65128974a0 100644 --- a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc +++ b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc @@ -29,8 +29,8 @@ ofdm_frame_equalizer_vcvc::make(ofdm_equalizer_base::sptr equalizer, bool propagate_channel_state, int fixed_frame_len) { - return gnuradio::get_initial_sptr(new ofdm_frame_equalizer_vcvc_impl( - equalizer, cp_len, tsb_key, propagate_channel_state, fixed_frame_len)); + return gnuradio::make_block_sptr<ofdm_frame_equalizer_vcvc_impl>( + equalizer, cp_len, tsb_key, propagate_channel_state, fixed_frame_len); } ofdm_frame_equalizer_vcvc_impl::ofdm_frame_equalizer_vcvc_impl( diff --git a/gr-digital/lib/ofdm_serializer_vcc_impl.cc b/gr-digital/lib/ofdm_serializer_vcc_impl.cc index 96c31607df..f4b9be3422 100644 --- a/gr-digital/lib/ofdm_serializer_vcc_impl.cc +++ b/gr-digital/lib/ofdm_serializer_vcc_impl.cc @@ -26,13 +26,13 @@ ofdm_serializer_vcc::make(int fft_len, const std::string& carr_offset_key, bool input_is_shifted) { - return gnuradio::get_initial_sptr(new ofdm_serializer_vcc_impl(fft_len, - occupied_carriers, - len_tag_key, - packet_len_tag_key, - symbols_skipped, - carr_offset_key, - input_is_shifted)); + return gnuradio::make_block_sptr<ofdm_serializer_vcc_impl>(fft_len, + occupied_carriers, + len_tag_key, + packet_len_tag_key, + symbols_skipped, + carr_offset_key, + input_is_shifted); } ofdm_serializer_vcc::sptr @@ -42,14 +42,14 @@ ofdm_serializer_vcc::make(const gr::digital::ofdm_carrier_allocator_cvc::sptr& a const std::string& carr_offset_key, bool input_is_shifted) { - return gnuradio::get_initial_sptr( - new ofdm_serializer_vcc_impl(allocator->fft_len(), - allocator->occupied_carriers(), - allocator->len_tag_key(), - packet_len_tag_key, - symbols_skipped, - carr_offset_key, - !input_is_shifted)); + return gnuradio::make_block_sptr<ofdm_serializer_vcc_impl>( + allocator->fft_len(), + allocator->occupied_carriers(), + allocator->len_tag_key(), + packet_len_tag_key, + symbols_skipped, + carr_offset_key, + !input_is_shifted); } ofdm_serializer_vcc_impl::ofdm_serializer_vcc_impl( diff --git a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc index 09aa1e8626..9cdb15aa3e 100644 --- a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc +++ b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc @@ -30,8 +30,8 @@ namespace digital { ofdm_sync_sc_cfb::sptr ofdm_sync_sc_cfb::make(int fft_len, int cp_len, bool use_even_carriers, float threshold) { - return gnuradio::get_initial_sptr( - new ofdm_sync_sc_cfb_impl(fft_len, cp_len, use_even_carriers, threshold)); + return gnuradio::make_block_sptr<ofdm_sync_sc_cfb_impl>( + fft_len, cp_len, use_even_carriers, threshold); } ofdm_sync_sc_cfb_impl::ofdm_sync_sc_cfb_impl(int fft_len, diff --git a/gr-digital/lib/packet_headergenerator_bb_impl.cc b/gr-digital/lib/packet_headergenerator_bb_impl.cc index 0e1fef601d..30f2f7932c 100644 --- a/gr-digital/lib/packet_headergenerator_bb_impl.cc +++ b/gr-digital/lib/packet_headergenerator_bb_impl.cc @@ -22,8 +22,8 @@ packet_headergenerator_bb::sptr packet_headergenerator_bb::make(const packet_header_default::sptr& header_formatter, const std::string& len_tag_key) { - return gnuradio::get_initial_sptr( - new packet_headergenerator_bb_impl(header_formatter, len_tag_key)); + return gnuradio::make_block_sptr<packet_headergenerator_bb_impl>(header_formatter, + len_tag_key); } @@ -32,8 +32,8 @@ packet_headergenerator_bb::make(long header_len, const std::string& len_tag_key) { const packet_header_default::sptr header_formatter( new packet_header_default(header_len, len_tag_key)); - return gnuradio::get_initial_sptr( - new packet_headergenerator_bb_impl(header_formatter, len_tag_key)); + return gnuradio::make_block_sptr<packet_headergenerator_bb_impl>(header_formatter, + len_tag_key); } diff --git a/gr-digital/lib/packet_headerparser_b_impl.cc b/gr-digital/lib/packet_headerparser_b_impl.cc index 70c52627c0..0833be5bbc 100644 --- a/gr-digital/lib/packet_headerparser_b_impl.cc +++ b/gr-digital/lib/packet_headerparser_b_impl.cc @@ -23,13 +23,13 @@ packet_headerparser_b::sptr packet_headerparser_b::make(long header_len, { const packet_header_default::sptr header_formatter( new packet_header_default(header_len, len_tag_key)); - return gnuradio::get_initial_sptr(new packet_headerparser_b_impl(header_formatter)); + return gnuradio::make_block_sptr<packet_headerparser_b_impl>(header_formatter); } packet_headerparser_b::sptr packet_headerparser_b::make( const gr::digital::packet_header_default::sptr& header_formatter) { - return gnuradio::get_initial_sptr(new packet_headerparser_b_impl(header_formatter)); + return gnuradio::make_block_sptr<packet_headerparser_b_impl>(header_formatter); } packet_headerparser_b_impl::packet_headerparser_b_impl( diff --git a/gr-digital/lib/packet_sink_impl.cc b/gr-digital/lib/packet_sink_impl.cc index 353c6eb5d5..88ec21f32f 100644 --- a/gr-digital/lib/packet_sink_impl.cc +++ b/gr-digital/lib/packet_sink_impl.cc @@ -68,8 +68,8 @@ packet_sink::sptr packet_sink::make(const std::vector<unsigned char>& sync_vecto msg_queue::sptr target_queue, int threshold) { - return gnuradio::get_initial_sptr( - new packet_sink_impl(sync_vector, target_queue, threshold)); + return gnuradio::make_block_sptr<packet_sink_impl>( + sync_vector, target_queue, threshold); } packet_sink_impl::packet_sink_impl(const std::vector<unsigned char>& sync_vector, diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc index d383dc4166..bdaa7d880a 100644 --- a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc @@ -33,8 +33,8 @@ pfb_clock_sync_ccf::sptr pfb_clock_sync_ccf::make(double sps, float max_rate_deviation, int osps) { - return gnuradio::get_initial_sptr(new pfb_clock_sync_ccf_impl( - sps, loop_bw, taps, filter_size, init_phase, max_rate_deviation, osps)); + return gnuradio::make_block_sptr<pfb_clock_sync_ccf_impl>( + sps, loop_bw, taps, filter_size, init_phase, max_rate_deviation, osps); } static int ios[] = { sizeof(gr_complex), sizeof(float), sizeof(float), sizeof(float) }; diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.cc b/gr-digital/lib/pfb_clock_sync_fff_impl.cc index dc33e680bc..fe3efc7435 100644 --- a/gr-digital/lib/pfb_clock_sync_fff_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_fff_impl.cc @@ -30,8 +30,8 @@ pfb_clock_sync_fff::sptr pfb_clock_sync_fff::make(double sps, float max_rate_deviation, int osps) { - return gnuradio::get_initial_sptr(new pfb_clock_sync_fff_impl( - sps, gain, taps, filter_size, init_phase, max_rate_deviation, osps)); + return gnuradio::make_block_sptr<pfb_clock_sync_fff_impl>( + sps, gain, taps, filter_size, init_phase, max_rate_deviation, osps); } static int ios[] = { sizeof(float), sizeof(float), sizeof(float), sizeof(float) }; diff --git a/gr-digital/lib/pn_correlator_cc_impl.cc b/gr-digital/lib/pn_correlator_cc_impl.cc index 2d023adea0..6254b23add 100644 --- a/gr-digital/lib/pn_correlator_cc_impl.cc +++ b/gr-digital/lib/pn_correlator_cc_impl.cc @@ -20,7 +20,7 @@ namespace digital { pn_correlator_cc::sptr pn_correlator_cc::make(int degree, int mask, int seed) { - return gnuradio::get_initial_sptr(new pn_correlator_cc_impl(degree, mask, seed)); + return gnuradio::make_block_sptr<pn_correlator_cc_impl>(degree, mask, seed); } pn_correlator_cc_impl::pn_correlator_cc_impl(int degree, int mask, int seed) diff --git a/gr-digital/lib/probe_density_b_impl.cc b/gr-digital/lib/probe_density_b_impl.cc index 1522b874dd..622aea5a9c 100644 --- a/gr-digital/lib/probe_density_b_impl.cc +++ b/gr-digital/lib/probe_density_b_impl.cc @@ -19,7 +19,7 @@ namespace digital { probe_density_b::sptr probe_density_b::make(double alpha) { - return gnuradio::get_initial_sptr(new probe_density_b_impl(alpha)); + return gnuradio::make_block_sptr<probe_density_b_impl>(alpha); } probe_density_b_impl::probe_density_b_impl(double alpha) 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 00a042fd87..5d48281531 100644 --- a/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc +++ b/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc @@ -22,8 +22,8 @@ namespace digital { probe_mpsk_snr_est_c::sptr probe_mpsk_snr_est_c::make(snr_est_type_t type, int msg_nsamples, double alpha) { - return gnuradio::get_initial_sptr( - new probe_mpsk_snr_est_c_impl(type, msg_nsamples, alpha)); + return gnuradio::make_block_sptr<probe_mpsk_snr_est_c_impl>( + type, msg_nsamples, alpha); } probe_mpsk_snr_est_c_impl::probe_mpsk_snr_est_c_impl(snr_est_type_t type, diff --git a/gr-digital/lib/protocol_formatter_async_impl.cc b/gr-digital/lib/protocol_formatter_async_impl.cc index 4a794ce680..0ea768a02c 100644 --- a/gr-digital/lib/protocol_formatter_async_impl.cc +++ b/gr-digital/lib/protocol_formatter_async_impl.cc @@ -23,7 +23,7 @@ namespace digital { protocol_formatter_async::sptr protocol_formatter_async::make(const header_format_base::sptr& format) { - return gnuradio::get_initial_sptr(new protocol_formatter_async_impl(format)); + return gnuradio::make_block_sptr<protocol_formatter_async_impl>(format); } protocol_formatter_async_impl::protocol_formatter_async_impl( diff --git a/gr-digital/lib/protocol_formatter_bb_impl.cc b/gr-digital/lib/protocol_formatter_bb_impl.cc index 627695e8e2..e613f1f019 100644 --- a/gr-digital/lib/protocol_formatter_bb_impl.cc +++ b/gr-digital/lib/protocol_formatter_bb_impl.cc @@ -24,8 +24,7 @@ protocol_formatter_bb::sptr protocol_formatter_bb::make(const header_format_base::sptr& format, const std::string& len_tag_key) { - return gnuradio::get_initial_sptr( - new protocol_formatter_bb_impl(format, len_tag_key)); + return gnuradio::make_block_sptr<protocol_formatter_bb_impl>(format, len_tag_key); } protocol_formatter_bb_impl::protocol_formatter_bb_impl( diff --git a/gr-digital/lib/protocol_parser_b_impl.cc b/gr-digital/lib/protocol_parser_b_impl.cc index cadc915d90..8dbef2153b 100644 --- a/gr-digital/lib/protocol_parser_b_impl.cc +++ b/gr-digital/lib/protocol_parser_b_impl.cc @@ -23,7 +23,7 @@ namespace digital { protocol_parser_b::sptr protocol_parser_b::make(const header_format_base::sptr& format) { - return gnuradio::get_initial_sptr(new protocol_parser_b_impl(format)); + return gnuradio::make_block_sptr<protocol_parser_b_impl>(format); } diff --git a/gr-digital/lib/scrambler_bb_impl.cc b/gr-digital/lib/scrambler_bb_impl.cc index 1eb639c0f5..765a08aa57 100644 --- a/gr-digital/lib/scrambler_bb_impl.cc +++ b/gr-digital/lib/scrambler_bb_impl.cc @@ -20,7 +20,7 @@ namespace digital { scrambler_bb::sptr scrambler_bb::make(int mask, int seed, int len) { - return gnuradio::get_initial_sptr(new scrambler_bb_impl(mask, seed, len)); + return gnuradio::make_block_sptr<scrambler_bb_impl>(mask, seed, len); } scrambler_bb_impl::scrambler_bb_impl(int mask, int seed, int len) diff --git a/gr-digital/lib/simple_correlator_impl.cc b/gr-digital/lib/simple_correlator_impl.cc index 4712874af6..e150bcf706 100644 --- a/gr-digital/lib/simple_correlator_impl.cc +++ b/gr-digital/lib/simple_correlator_impl.cc @@ -28,7 +28,7 @@ static const int THRESHOLD = 3; simple_correlator::sptr simple_correlator::make(int payload_bytesize) { - return gnuradio::get_initial_sptr(new simple_correlator_impl(payload_bytesize)); + return gnuradio::make_block_sptr<simple_correlator_impl>(payload_bytesize); } simple_correlator_impl::simple_correlator_impl(int payload_bytesize) diff --git a/gr-digital/lib/simple_framer_impl.cc b/gr-digital/lib/simple_framer_impl.cc index df34f1679b..27d3089031 100644 --- a/gr-digital/lib/simple_framer_impl.cc +++ b/gr-digital/lib/simple_framer_impl.cc @@ -23,7 +23,7 @@ namespace digital { simple_framer::sptr simple_framer::make(int payload_bytesize) { - return gnuradio::get_initial_sptr(new simple_framer_impl(payload_bytesize)); + return gnuradio::make_block_sptr<simple_framer_impl>(payload_bytesize); } simple_framer_impl::simple_framer_impl(int payload_bytesize) diff --git a/gr-digital/lib/symbol_sync_cc_impl.cc b/gr-digital/lib/symbol_sync_cc_impl.cc index 55f162dc72..6446b25701 100644 --- a/gr-digital/lib/symbol_sync_cc_impl.cc +++ b/gr-digital/lib/symbol_sync_cc_impl.cc @@ -33,17 +33,17 @@ symbol_sync_cc::sptr symbol_sync_cc::make(enum ted_type detector_type, int n_filters, const std::vector<float>& taps) { - return gnuradio::get_initial_sptr(new symbol_sync_cc_impl(detector_type, - sps, - loop_bw, - damping_factor, - ted_gain, - max_deviation, - osps, - slicer, - interp_type, - n_filters, - taps)); + return gnuradio::make_block_sptr<symbol_sync_cc_impl>(detector_type, + sps, + loop_bw, + damping_factor, + ted_gain, + max_deviation, + osps, + slicer, + interp_type, + n_filters, + taps); } symbol_sync_cc_impl::symbol_sync_cc_impl(enum ted_type detector_type, diff --git a/gr-digital/lib/symbol_sync_ff_impl.cc b/gr-digital/lib/symbol_sync_ff_impl.cc index 1172c1b4f8..82493f565c 100644 --- a/gr-digital/lib/symbol_sync_ff_impl.cc +++ b/gr-digital/lib/symbol_sync_ff_impl.cc @@ -33,17 +33,17 @@ symbol_sync_ff::sptr symbol_sync_ff::make(enum ted_type detector_type, int n_filters, const std::vector<float>& taps) { - return gnuradio::get_initial_sptr(new symbol_sync_ff_impl(detector_type, - sps, - loop_bw, - damping_factor, - ted_gain, - max_deviation, - osps, - slicer, - interp_type, - n_filters, - taps)); + return gnuradio::make_block_sptr<symbol_sync_ff_impl>(detector_type, + sps, + loop_bw, + damping_factor, + ted_gain, + max_deviation, + osps, + slicer, + interp_type, + n_filters, + taps); } symbol_sync_ff_impl::symbol_sync_ff_impl(enum ted_type detector_type, |