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-blocks/lib | |
| 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-blocks/lib')
152 files changed, 192 insertions, 211 deletions
diff --git a/gr-blocks/lib/abs_blk_impl.cc b/gr-blocks/lib/abs_blk_impl.cc index 1a3fadac99..177adba3cf 100644 --- a/gr-blocks/lib/abs_blk_impl.cc +++ b/gr-blocks/lib/abs_blk_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename abs_blk<T>::sptr abs_blk<T>::make(size_t vlen) { - return gnuradio::get_initial_sptr(new abs_blk_impl<T>(vlen)); + return gnuradio::make_block_sptr<abs_blk_impl<T>>(vlen); } template <class T> diff --git a/gr-blocks/lib/add_blk_impl.cc b/gr-blocks/lib/add_blk_impl.cc index 93d3798f45..f0dfa2f248 100644 --- a/gr-blocks/lib/add_blk_impl.cc +++ b/gr-blocks/lib/add_blk_impl.cc @@ -23,7 +23,7 @@ namespace blocks { template <class T> typename add_blk<T>::sptr add_blk<T>::make(size_t vlen) { - return gnuradio::get_initial_sptr(new add_blk_impl<T>(vlen)); + return gnuradio::make_block_sptr<add_blk_impl<T>>(vlen); } diff --git a/gr-blocks/lib/add_const_bb_impl.cc b/gr-blocks/lib/add_const_bb_impl.cc index d184379b4b..b3497c9b7d 100644 --- a/gr-blocks/lib/add_const_bb_impl.cc +++ b/gr-blocks/lib/add_const_bb_impl.cc @@ -20,7 +20,7 @@ namespace blocks { add_const_bb::sptr add_const_bb::make(unsigned char k) { - return gnuradio::get_initial_sptr(new add_const_bb_impl(k)); + return gnuradio::make_block_sptr<add_const_bb_impl>(k); } add_const_bb_impl::add_const_bb_impl(unsigned char k) diff --git a/gr-blocks/lib/add_const_cc_impl.cc b/gr-blocks/lib/add_const_cc_impl.cc index ec5408993c..bb548a8042 100644 --- a/gr-blocks/lib/add_const_cc_impl.cc +++ b/gr-blocks/lib/add_const_cc_impl.cc @@ -20,7 +20,7 @@ namespace blocks { add_const_cc::sptr add_const_cc::make(gr_complex k) { - return gnuradio::get_initial_sptr(new add_const_cc_impl(k)); + return gnuradio::make_block_sptr<add_const_cc_impl>(k); } add_const_cc_impl::add_const_cc_impl(gr_complex k) diff --git a/gr-blocks/lib/add_const_ff_impl.cc b/gr-blocks/lib/add_const_ff_impl.cc index 0fd6a5fde0..6cbff0cddd 100644 --- a/gr-blocks/lib/add_const_ff_impl.cc +++ b/gr-blocks/lib/add_const_ff_impl.cc @@ -20,7 +20,7 @@ namespace blocks { add_const_ff::sptr add_const_ff::make(float k) { - return gnuradio::get_initial_sptr(new add_const_ff_impl(k)); + return gnuradio::make_block_sptr<add_const_ff_impl>(k); } add_const_ff_impl::add_const_ff_impl(float k) diff --git a/gr-blocks/lib/add_const_ii_impl.cc b/gr-blocks/lib/add_const_ii_impl.cc index 0d92e9a74e..04500f8813 100644 --- a/gr-blocks/lib/add_const_ii_impl.cc +++ b/gr-blocks/lib/add_const_ii_impl.cc @@ -20,7 +20,7 @@ namespace blocks { add_const_ii::sptr add_const_ii::make(int k) { - return gnuradio::get_initial_sptr(new add_const_ii_impl(k)); + return gnuradio::make_block_sptr<add_const_ii_impl>(k); } add_const_ii_impl::add_const_ii_impl(int k) diff --git a/gr-blocks/lib/add_const_ss_impl.cc b/gr-blocks/lib/add_const_ss_impl.cc index 2e8b85a23e..d5c292a989 100644 --- a/gr-blocks/lib/add_const_ss_impl.cc +++ b/gr-blocks/lib/add_const_ss_impl.cc @@ -20,7 +20,7 @@ namespace blocks { add_const_ss::sptr add_const_ss::make(short k) { - return gnuradio::get_initial_sptr(new add_const_ss_impl(k)); + return gnuradio::make_block_sptr<add_const_ss_impl>(k); } add_const_ss_impl::add_const_ss_impl(short k) diff --git a/gr-blocks/lib/add_const_v_impl.cc b/gr-blocks/lib/add_const_v_impl.cc index 8b2ccdd903..3badca18d6 100644 --- a/gr-blocks/lib/add_const_v_impl.cc +++ b/gr-blocks/lib/add_const_v_impl.cc @@ -21,7 +21,7 @@ namespace blocks { template <class T> typename add_const_v<T>::sptr add_const_v<T>::make(std::vector<T> k) { - return gnuradio::get_initial_sptr(new add_const_v_impl<T>(k)); + return gnuradio::make_block_sptr<add_const_v_impl<T>>(k); } template <class T> diff --git a/gr-blocks/lib/and_blk_impl.cc b/gr-blocks/lib/and_blk_impl.cc index f0245b897c..55d9909acf 100644 --- a/gr-blocks/lib/and_blk_impl.cc +++ b/gr-blocks/lib/and_blk_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename and_blk<T>::sptr and_blk<T>::make(size_t vlen) { - return gnuradio::get_initial_sptr(new and_blk_impl<T>(vlen)); + return gnuradio::make_block_sptr<and_blk_impl<T>>(vlen); } template <class T> diff --git a/gr-blocks/lib/and_const_impl.cc b/gr-blocks/lib/and_const_impl.cc index 3f73f155d4..4a5b177fa5 100644 --- a/gr-blocks/lib/and_const_impl.cc +++ b/gr-blocks/lib/and_const_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename and_const<T>::sptr and_const<T>::make(T k) { - return gnuradio::get_initial_sptr(new and_const_impl<T>(k)); + return gnuradio::make_block_sptr<and_const_impl<T>>(k); } template <class T> diff --git a/gr-blocks/lib/annotator_1to1_impl.cc b/gr-blocks/lib/annotator_1to1_impl.cc index 5df55f78a5..03e247a420 100644 --- a/gr-blocks/lib/annotator_1to1_impl.cc +++ b/gr-blocks/lib/annotator_1to1_impl.cc @@ -23,7 +23,7 @@ namespace blocks { annotator_1to1::sptr annotator_1to1::make(int when, size_t sizeof_stream_item) { - return gnuradio::get_initial_sptr(new annotator_1to1_impl(when, sizeof_stream_item)); + return gnuradio::make_block_sptr<annotator_1to1_impl>(when, sizeof_stream_item); } annotator_1to1_impl::annotator_1to1_impl(int when, size_t sizeof_stream_item) diff --git a/gr-blocks/lib/annotator_alltoall_impl.cc b/gr-blocks/lib/annotator_alltoall_impl.cc index b3cc6d07ca..69637c0957 100644 --- a/gr-blocks/lib/annotator_alltoall_impl.cc +++ b/gr-blocks/lib/annotator_alltoall_impl.cc @@ -23,8 +23,7 @@ namespace blocks { annotator_alltoall::sptr annotator_alltoall::make(int when, size_t sizeof_stream_item) { - return gnuradio::get_initial_sptr( - new annotator_alltoall_impl(when, sizeof_stream_item)); + return gnuradio::make_block_sptr<annotator_alltoall_impl>(when, sizeof_stream_item); } annotator_alltoall_impl::annotator_alltoall_impl(int when, size_t sizeof_stream_item) diff --git a/gr-blocks/lib/annotator_raw_impl.cc b/gr-blocks/lib/annotator_raw_impl.cc index ebdf23247d..bc3e543ccc 100644 --- a/gr-blocks/lib/annotator_raw_impl.cc +++ b/gr-blocks/lib/annotator_raw_impl.cc @@ -26,7 +26,7 @@ namespace blocks { annotator_raw::sptr annotator_raw::make(size_t sizeof_stream_item) { - return gnuradio::get_initial_sptr(new annotator_raw_impl(sizeof_stream_item)); + return gnuradio::make_block_sptr<annotator_raw_impl>(sizeof_stream_item); } annotator_raw_impl::annotator_raw_impl(size_t sizeof_stream_item) diff --git a/gr-blocks/lib/argmax_impl.cc b/gr-blocks/lib/argmax_impl.cc index f3a8c723b0..fc6769d215 100644 --- a/gr-blocks/lib/argmax_impl.cc +++ b/gr-blocks/lib/argmax_impl.cc @@ -21,7 +21,7 @@ namespace blocks { template <class T> typename argmax<T>::sptr argmax<T>::make(size_t vlen) { - return gnuradio::get_initial_sptr(new argmax_impl<T>(vlen)); + return gnuradio::make_block_sptr<argmax_impl<T>>(vlen); } template <class T> diff --git a/gr-blocks/lib/burst_tagger_impl.cc b/gr-blocks/lib/burst_tagger_impl.cc index b373d8714c..c198aee603 100644 --- a/gr-blocks/lib/burst_tagger_impl.cc +++ b/gr-blocks/lib/burst_tagger_impl.cc @@ -21,7 +21,7 @@ namespace blocks { burst_tagger::sptr burst_tagger::make(size_t itemsize) { - return gnuradio::get_initial_sptr(new burst_tagger_impl(itemsize)); + return gnuradio::make_block_sptr<burst_tagger_impl>(itemsize); } burst_tagger_impl::burst_tagger_impl(size_t itemsize) diff --git a/gr-blocks/lib/char_to_float_impl.cc b/gr-blocks/lib/char_to_float_impl.cc index 71f5197d7c..804775d7d3 100644 --- a/gr-blocks/lib/char_to_float_impl.cc +++ b/gr-blocks/lib/char_to_float_impl.cc @@ -21,7 +21,7 @@ namespace blocks { char_to_float::sptr char_to_float::make(size_t vlen, float scale) { - return gnuradio::get_initial_sptr(new char_to_float_impl(vlen, scale)); + return gnuradio::make_block_sptr<char_to_float_impl>(vlen, scale); } char_to_float_impl::char_to_float_impl(size_t vlen, float scale) diff --git a/gr-blocks/lib/char_to_short_impl.cc b/gr-blocks/lib/char_to_short_impl.cc index c5255553ce..a1a798708a 100644 --- a/gr-blocks/lib/char_to_short_impl.cc +++ b/gr-blocks/lib/char_to_short_impl.cc @@ -21,7 +21,7 @@ namespace blocks { char_to_short::sptr char_to_short::make(size_t vlen) { - return gnuradio::get_initial_sptr(new char_to_short_impl(vlen)); + return gnuradio::make_block_sptr<char_to_short_impl>(vlen); } char_to_short_impl::char_to_short_impl(size_t vlen) diff --git a/gr-blocks/lib/check_lfsr_32k_s_impl.cc b/gr-blocks/lib/check_lfsr_32k_s_impl.cc index 2e51fbf6c1..0b8092abcc 100644 --- a/gr-blocks/lib/check_lfsr_32k_s_impl.cc +++ b/gr-blocks/lib/check_lfsr_32k_s_impl.cc @@ -22,7 +22,7 @@ namespace blocks { check_lfsr_32k_s::sptr check_lfsr_32k_s::make() { - return gnuradio::get_initial_sptr(new check_lfsr_32k_s_impl()); + return gnuradio::make_block_sptr<check_lfsr_32k_s_impl>(); } check_lfsr_32k_s_impl::check_lfsr_32k_s_impl() diff --git a/gr-blocks/lib/complex_to_arg_impl.cc b/gr-blocks/lib/complex_to_arg_impl.cc index cf489d8a3f..3fb92218e3 100644 --- a/gr-blocks/lib/complex_to_arg_impl.cc +++ b/gr-blocks/lib/complex_to_arg_impl.cc @@ -22,7 +22,7 @@ namespace blocks { complex_to_arg::sptr complex_to_arg::make(size_t vlen) { - return gnuradio::get_initial_sptr(new complex_to_arg_impl(vlen)); + return gnuradio::make_block_sptr<complex_to_arg_impl>(vlen); } complex_to_arg_impl::complex_to_arg_impl(size_t vlen) diff --git a/gr-blocks/lib/complex_to_float_impl.cc b/gr-blocks/lib/complex_to_float_impl.cc index d790ec7992..8f53d40f29 100644 --- a/gr-blocks/lib/complex_to_float_impl.cc +++ b/gr-blocks/lib/complex_to_float_impl.cc @@ -21,7 +21,7 @@ namespace blocks { complex_to_float::sptr complex_to_float::make(size_t vlen) { - return gnuradio::get_initial_sptr(new complex_to_float_impl(vlen)); + return gnuradio::make_block_sptr<complex_to_float_impl>(vlen); } complex_to_float_impl::complex_to_float_impl(size_t vlen) diff --git a/gr-blocks/lib/complex_to_imag_impl.cc b/gr-blocks/lib/complex_to_imag_impl.cc index d187908db2..d3838c0518 100644 --- a/gr-blocks/lib/complex_to_imag_impl.cc +++ b/gr-blocks/lib/complex_to_imag_impl.cc @@ -21,7 +21,7 @@ namespace blocks { complex_to_imag::sptr complex_to_imag::make(size_t vlen) { - return gnuradio::get_initial_sptr(new complex_to_imag_impl(vlen)); + return gnuradio::make_block_sptr<complex_to_imag_impl>(vlen); } complex_to_imag_impl::complex_to_imag_impl(size_t vlen) diff --git a/gr-blocks/lib/complex_to_interleaved_char_impl.cc b/gr-blocks/lib/complex_to_interleaved_char_impl.cc index a60a3d9675..5952118019 100644 --- a/gr-blocks/lib/complex_to_interleaved_char_impl.cc +++ b/gr-blocks/lib/complex_to_interleaved_char_impl.cc @@ -22,8 +22,8 @@ namespace blocks { complex_to_interleaved_char::sptr complex_to_interleaved_char::make(bool vector, float scale_factor) { - return gnuradio::get_initial_sptr( - new complex_to_interleaved_char_impl(vector, scale_factor)); + return gnuradio::make_block_sptr<complex_to_interleaved_char_impl>(vector, + scale_factor); } complex_to_interleaved_char_impl::complex_to_interleaved_char_impl(bool vector, diff --git a/gr-blocks/lib/complex_to_interleaved_short_impl.cc b/gr-blocks/lib/complex_to_interleaved_short_impl.cc index 6a20e0b59f..3730ec3602 100644 --- a/gr-blocks/lib/complex_to_interleaved_short_impl.cc +++ b/gr-blocks/lib/complex_to_interleaved_short_impl.cc @@ -22,8 +22,8 @@ namespace blocks { complex_to_interleaved_short::sptr complex_to_interleaved_short::make(bool vector, float scale_factor) { - return gnuradio::get_initial_sptr( - new complex_to_interleaved_short_impl(vector, scale_factor)); + return gnuradio::make_block_sptr<complex_to_interleaved_short_impl>(vector, + scale_factor); } complex_to_interleaved_short_impl::complex_to_interleaved_short_impl(bool vector, diff --git a/gr-blocks/lib/complex_to_mag_impl.cc b/gr-blocks/lib/complex_to_mag_impl.cc index 3334bed2ba..47a1f92867 100644 --- a/gr-blocks/lib/complex_to_mag_impl.cc +++ b/gr-blocks/lib/complex_to_mag_impl.cc @@ -21,7 +21,7 @@ namespace blocks { complex_to_mag::sptr complex_to_mag::make(size_t vlen) { - return gnuradio::get_initial_sptr(new complex_to_mag_impl(vlen)); + return gnuradio::make_block_sptr<complex_to_mag_impl>(vlen); } complex_to_mag_impl::complex_to_mag_impl(size_t vlen) diff --git a/gr-blocks/lib/complex_to_mag_squared_impl.cc b/gr-blocks/lib/complex_to_mag_squared_impl.cc index 62900d2a0c..353714320d 100644 --- a/gr-blocks/lib/complex_to_mag_squared_impl.cc +++ b/gr-blocks/lib/complex_to_mag_squared_impl.cc @@ -21,7 +21,7 @@ namespace blocks { complex_to_mag_squared::sptr complex_to_mag_squared::make(size_t vlen) { - return gnuradio::get_initial_sptr(new complex_to_mag_squared_impl(vlen)); + return gnuradio::make_block_sptr<complex_to_mag_squared_impl>(vlen); } complex_to_mag_squared_impl::complex_to_mag_squared_impl(size_t vlen) diff --git a/gr-blocks/lib/complex_to_magphase_impl.cc b/gr-blocks/lib/complex_to_magphase_impl.cc index 6f8dcf2089..4c9b01461d 100644 --- a/gr-blocks/lib/complex_to_magphase_impl.cc +++ b/gr-blocks/lib/complex_to_magphase_impl.cc @@ -22,7 +22,7 @@ namespace blocks { complex_to_magphase::sptr complex_to_magphase::make(size_t vlen) { - return gnuradio::get_initial_sptr(new complex_to_magphase_impl(vlen)); + return gnuradio::make_block_sptr<complex_to_magphase_impl>(vlen); } complex_to_magphase_impl::complex_to_magphase_impl(size_t vlen) diff --git a/gr-blocks/lib/complex_to_real_impl.cc b/gr-blocks/lib/complex_to_real_impl.cc index 0ae2bc0462..b17de44792 100644 --- a/gr-blocks/lib/complex_to_real_impl.cc +++ b/gr-blocks/lib/complex_to_real_impl.cc @@ -21,7 +21,7 @@ namespace blocks { complex_to_real::sptr complex_to_real::make(size_t vlen) { - return gnuradio::get_initial_sptr(new complex_to_real_impl(vlen)); + return gnuradio::make_block_sptr<complex_to_real_impl>(vlen); } complex_to_real_impl::complex_to_real_impl(size_t vlen) diff --git a/gr-blocks/lib/conjugate_cc_impl.cc b/gr-blocks/lib/conjugate_cc_impl.cc index a4f30c81b1..73caf7e43e 100644 --- a/gr-blocks/lib/conjugate_cc_impl.cc +++ b/gr-blocks/lib/conjugate_cc_impl.cc @@ -21,7 +21,7 @@ namespace blocks { conjugate_cc::sptr conjugate_cc::make() { - return gnuradio::get_initial_sptr(new conjugate_cc_impl()); + return gnuradio::make_block_sptr<conjugate_cc_impl>(); } conjugate_cc_impl::conjugate_cc_impl() diff --git a/gr-blocks/lib/copy_impl.cc b/gr-blocks/lib/copy_impl.cc index c963f0d635..c4108f5fc9 100644 --- a/gr-blocks/lib/copy_impl.cc +++ b/gr-blocks/lib/copy_impl.cc @@ -21,7 +21,7 @@ namespace blocks { copy::sptr copy::make(size_t itemsize) { - return gnuradio::get_initial_sptr(new copy_impl(itemsize)); + return gnuradio::make_block_sptr<copy_impl>(itemsize); } copy_impl::copy_impl(size_t itemsize) diff --git a/gr-blocks/lib/correctiq_auto_impl.cc b/gr-blocks/lib/correctiq_auto_impl.cc index 76f3ed5e7b..31fab551fc 100644 --- a/gr-blocks/lib/correctiq_auto_impl.cc +++ b/gr-blocks/lib/correctiq_auto_impl.cc @@ -23,8 +23,8 @@ namespace blocks { correctiq_auto::sptr correctiq_auto::make(double samp_rate, double freq, float gain, float sync_window) { - return gnuradio::get_initial_sptr( - new correctiq_auto_impl(samp_rate, freq, gain, sync_window)); + return gnuradio::make_block_sptr<correctiq_auto_impl>( + samp_rate, freq, gain, sync_window); } /* diff --git a/gr-blocks/lib/correctiq_impl.cc b/gr-blocks/lib/correctiq_impl.cc index d44b36ddc0..f0870697d1 100644 --- a/gr-blocks/lib/correctiq_impl.cc +++ b/gr-blocks/lib/correctiq_impl.cc @@ -18,10 +18,7 @@ namespace gr { namespace blocks { -correctiq::sptr correctiq::make() -{ - return gnuradio::get_initial_sptr(new correctiq_impl()); -} +correctiq::sptr correctiq::make() { return gnuradio::make_block_sptr<correctiq_impl>(); } /* * The private constructor diff --git a/gr-blocks/lib/correctiq_man_impl.cc b/gr-blocks/lib/correctiq_man_impl.cc index ab82c72402..f9df4a496e 100644 --- a/gr-blocks/lib/correctiq_man_impl.cc +++ b/gr-blocks/lib/correctiq_man_impl.cc @@ -21,7 +21,7 @@ namespace blocks { correctiq_man::sptr correctiq_man::make(float real, float imag) { - return gnuradio::get_initial_sptr(new correctiq_man_impl(real, imag)); + return gnuradio::make_block_sptr<correctiq_man_impl>(real, imag); } /* diff --git a/gr-blocks/lib/correctiq_swapiq_impl.cc b/gr-blocks/lib/correctiq_swapiq_impl.cc index 3c7a9405dd..3e8a5781f3 100644 --- a/gr-blocks/lib/correctiq_swapiq_impl.cc +++ b/gr-blocks/lib/correctiq_swapiq_impl.cc @@ -20,7 +20,7 @@ namespace blocks { swap_iq::sptr swap_iq::make(int datatype, int datasize) { - return gnuradio::get_initial_sptr(new swap_iq_impl(datatype, datasize)); + return gnuradio::make_block_sptr<swap_iq_impl>(datatype, datasize); } /* diff --git a/gr-blocks/lib/ctrlport_probe2_b_impl.cc b/gr-blocks/lib/ctrlport_probe2_b_impl.cc index 02182b3a60..f973961d59 100644 --- a/gr-blocks/lib/ctrlport_probe2_b_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_b_impl.cc @@ -23,8 +23,7 @@ ctrlport_probe2_b::sptr ctrlport_probe2_b::make(const std::string& id, int len, unsigned int disp_mask) { - return gnuradio::get_initial_sptr( - new ctrlport_probe2_b_impl(id, desc, len, disp_mask)); + return gnuradio::make_block_sptr<ctrlport_probe2_b_impl>(id, desc, len, disp_mask); } ctrlport_probe2_b_impl::ctrlport_probe2_b_impl(const std::string& id, diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.cc b/gr-blocks/lib/ctrlport_probe2_c_impl.cc index b89735f88b..264fd2b934 100644 --- a/gr-blocks/lib/ctrlport_probe2_c_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_c_impl.cc @@ -23,8 +23,7 @@ ctrlport_probe2_c::sptr ctrlport_probe2_c::make(const std::string& id, int len, unsigned int disp_mask) { - return gnuradio::get_initial_sptr( - new ctrlport_probe2_c_impl(id, desc, len, disp_mask)); + return gnuradio::make_block_sptr<ctrlport_probe2_c_impl>(id, desc, len, disp_mask); } ctrlport_probe2_c_impl::ctrlport_probe2_c_impl(const std::string& id, diff --git a/gr-blocks/lib/ctrlport_probe2_f_impl.cc b/gr-blocks/lib/ctrlport_probe2_f_impl.cc index abf63d389d..25f1e52444 100644 --- a/gr-blocks/lib/ctrlport_probe2_f_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_f_impl.cc @@ -23,8 +23,7 @@ ctrlport_probe2_f::sptr ctrlport_probe2_f::make(const std::string& id, int len, unsigned int disp_mask) { - return gnuradio::get_initial_sptr( - new ctrlport_probe2_f_impl(id, desc, len, disp_mask)); + return gnuradio::make_block_sptr<ctrlport_probe2_f_impl>(id, desc, len, disp_mask); } ctrlport_probe2_f_impl::ctrlport_probe2_f_impl(const std::string& id, diff --git a/gr-blocks/lib/ctrlport_probe2_i_impl.cc b/gr-blocks/lib/ctrlport_probe2_i_impl.cc index c8a1a00331..68b371b41c 100644 --- a/gr-blocks/lib/ctrlport_probe2_i_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_i_impl.cc @@ -23,8 +23,7 @@ ctrlport_probe2_i::sptr ctrlport_probe2_i::make(const std::string& id, int len, unsigned int disp_mask) { - return gnuradio::get_initial_sptr( - new ctrlport_probe2_i_impl(id, desc, len, disp_mask)); + return gnuradio::make_block_sptr<ctrlport_probe2_i_impl>(id, desc, len, disp_mask); } ctrlport_probe2_i_impl::ctrlport_probe2_i_impl(const std::string& id, diff --git a/gr-blocks/lib/ctrlport_probe2_s_impl.cc b/gr-blocks/lib/ctrlport_probe2_s_impl.cc index 76e853043b..60e50f1b13 100644 --- a/gr-blocks/lib/ctrlport_probe2_s_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_s_impl.cc @@ -23,8 +23,7 @@ ctrlport_probe2_s::sptr ctrlport_probe2_s::make(const std::string& id, int len, unsigned disp_mask) { - return gnuradio::get_initial_sptr( - new ctrlport_probe2_s_impl(id, desc, len, disp_mask)); + return gnuradio::make_block_sptr<ctrlport_probe2_s_impl>(id, desc, len, disp_mask); } ctrlport_probe2_s_impl::ctrlport_probe2_s_impl(const std::string& id, diff --git a/gr-blocks/lib/ctrlport_probe_c_impl.cc b/gr-blocks/lib/ctrlport_probe_c_impl.cc index 8470853253..dac72066c7 100644 --- a/gr-blocks/lib/ctrlport_probe_c_impl.cc +++ b/gr-blocks/lib/ctrlport_probe_c_impl.cc @@ -21,7 +21,7 @@ namespace blocks { ctrlport_probe_c::sptr ctrlport_probe_c::make(const std::string& id, const std::string& desc) { - return gnuradio::get_initial_sptr(new ctrlport_probe_c_impl(id, desc)); + return gnuradio::make_block_sptr<ctrlport_probe_c_impl>(id, desc); } ctrlport_probe_c_impl::ctrlport_probe_c_impl(const std::string& id, diff --git a/gr-blocks/lib/deinterleave_impl.cc b/gr-blocks/lib/deinterleave_impl.cc index 98ad404fad..d13e5f8d2c 100644 --- a/gr-blocks/lib/deinterleave_impl.cc +++ b/gr-blocks/lib/deinterleave_impl.cc @@ -20,7 +20,7 @@ namespace blocks { deinterleave::sptr deinterleave::make(size_t itemsize, unsigned int blocksize) { - return gnuradio::get_initial_sptr(new deinterleave_impl(itemsize, blocksize)); + return gnuradio::make_block_sptr<deinterleave_impl>(itemsize, blocksize); } deinterleave_impl::deinterleave_impl(size_t itemsize, unsigned int blocksize) diff --git a/gr-blocks/lib/delay_impl.cc b/gr-blocks/lib/delay_impl.cc index 97e3ecf92f..4d998a818d 100644 --- a/gr-blocks/lib/delay_impl.cc +++ b/gr-blocks/lib/delay_impl.cc @@ -21,7 +21,7 @@ namespace blocks { delay::sptr delay::make(size_t itemsize, int delay) { - return gnuradio::get_initial_sptr(new delay_impl(itemsize, delay)); + return gnuradio::make_block_sptr<delay_impl>(itemsize, delay); } delay_impl::delay_impl(size_t itemsize, int delay) diff --git a/gr-blocks/lib/divide_impl.cc b/gr-blocks/lib/divide_impl.cc index 5244877602..7edd6d4f8e 100644 --- a/gr-blocks/lib/divide_impl.cc +++ b/gr-blocks/lib/divide_impl.cc @@ -23,7 +23,7 @@ namespace blocks { template <class T> typename divide<T>::sptr divide<T>::make(size_t vlen) { - return gnuradio::get_initial_sptr(new divide_impl<T>(vlen)); + return gnuradio::make_block_sptr<divide_impl<T>>(vlen); } template <> diff --git a/gr-blocks/lib/endian_swap_impl.cc b/gr-blocks/lib/endian_swap_impl.cc index 89c3ffb9e1..181b6d6033 100644 --- a/gr-blocks/lib/endian_swap_impl.cc +++ b/gr-blocks/lib/endian_swap_impl.cc @@ -21,7 +21,7 @@ namespace blocks { endian_swap::sptr endian_swap::make(size_t item_size_bytes) { - return gnuradio::get_initial_sptr(new endian_swap_impl(item_size_bytes)); + return gnuradio::make_block_sptr<endian_swap_impl>(item_size_bytes); } endian_swap_impl::endian_swap_impl(size_t item_size_bytes) diff --git a/gr-blocks/lib/exponentiate_const_cci_impl.cc b/gr-blocks/lib/exponentiate_const_cci_impl.cc index 678b3269bd..6b3abb019d 100644 --- a/gr-blocks/lib/exponentiate_const_cci_impl.cc +++ b/gr-blocks/lib/exponentiate_const_cci_impl.cc @@ -21,7 +21,7 @@ namespace blocks { exponentiate_const_cci::sptr exponentiate_const_cci::make(int exponent, size_t vlen) { - return gnuradio::get_initial_sptr(new exponentiate_const_cci_impl(exponent, vlen)); + return gnuradio::make_block_sptr<exponentiate_const_cci_impl>(exponent, vlen); } /* diff --git a/gr-blocks/lib/file_descriptor_sink_impl.cc b/gr-blocks/lib/file_descriptor_sink_impl.cc index 809b96e8c1..a065dfbdc5 100644 --- a/gr-blocks/lib/file_descriptor_sink_impl.cc +++ b/gr-blocks/lib/file_descriptor_sink_impl.cc @@ -31,7 +31,7 @@ namespace blocks { file_descriptor_sink::sptr file_descriptor_sink::make(size_t itemsize, int fd) { - return gnuradio::get_initial_sptr(new file_descriptor_sink_impl(itemsize, fd)); + return gnuradio::make_block_sptr<file_descriptor_sink_impl>(itemsize, fd); } file_descriptor_sink_impl::file_descriptor_sink_impl(size_t itemsize, int fd) diff --git a/gr-blocks/lib/file_descriptor_source_impl.cc b/gr-blocks/lib/file_descriptor_source_impl.cc index 33f317103f..73d8a0763d 100644 --- a/gr-blocks/lib/file_descriptor_source_impl.cc +++ b/gr-blocks/lib/file_descriptor_source_impl.cc @@ -33,8 +33,7 @@ namespace blocks { file_descriptor_source::sptr file_descriptor_source::make(size_t itemsize, int fd, bool repeat) { - return gnuradio::get_initial_sptr( - new file_descriptor_source_impl(itemsize, fd, repeat)); + return gnuradio::make_block_sptr<file_descriptor_source_impl>(itemsize, fd, repeat); } file_descriptor_source_impl::file_descriptor_source_impl(size_t itemsize, diff --git a/gr-blocks/lib/file_meta_sink_impl.cc b/gr-blocks/lib/file_meta_sink_impl.cc index 24ae787747..ff7416aeed 100644 --- a/gr-blocks/lib/file_meta_sink_impl.cc +++ b/gr-blocks/lib/file_meta_sink_impl.cc @@ -53,15 +53,15 @@ file_meta_sink::sptr file_meta_sink::make(size_t itemsize, pmt::pmt_t extra_dict, bool detached_header) { - return gnuradio::get_initial_sptr(new file_meta_sink_impl(itemsize, - filename, - samp_rate, - relative_rate, - type, - complex, - max_segment_size, - extra_dict, - detached_header)); + return gnuradio::make_block_sptr<file_meta_sink_impl>(itemsize, + filename, + samp_rate, + relative_rate, + type, + complex, + max_segment_size, + extra_dict, + detached_header); } file_meta_sink_impl::file_meta_sink_impl(size_t itemsize, diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc index e5d7f5a46a..55fa069c7c 100644 --- a/gr-blocks/lib/file_meta_source_impl.cc +++ b/gr-blocks/lib/file_meta_source_impl.cc @@ -48,8 +48,8 @@ file_meta_source::sptr file_meta_source::make(const std::string& filename, bool detached_header, const std::string& hdr_filename) { - return gnuradio::get_initial_sptr( - new file_meta_source_impl(filename, repeat, detached_header, hdr_filename)); + return gnuradio::make_block_sptr<file_meta_source_impl>( + filename, repeat, detached_header, hdr_filename); } file_meta_source_impl::file_meta_source_impl(const std::string& filename, diff --git a/gr-blocks/lib/file_sink_impl.cc b/gr-blocks/lib/file_sink_impl.cc index 75995da9a0..b3c63649c8 100644 --- a/gr-blocks/lib/file_sink_impl.cc +++ b/gr-blocks/lib/file_sink_impl.cc @@ -21,7 +21,7 @@ namespace blocks { file_sink::sptr file_sink::make(size_t itemsize, const char* filename, bool append) { - return gnuradio::get_initial_sptr(new file_sink_impl(itemsize, filename, append)); + return gnuradio::make_block_sptr<file_sink_impl>(itemsize, filename, append); } file_sink_impl::file_sink_impl(size_t itemsize, const char* filename, bool append) diff --git a/gr-blocks/lib/file_source_impl.cc b/gr-blocks/lib/file_source_impl.cc index 69cb235a48..ee8e30f8a9 100644 --- a/gr-blocks/lib/file_source_impl.cc +++ b/gr-blocks/lib/file_source_impl.cc @@ -46,8 +46,8 @@ file_source::sptr file_source::make(size_t itemsize, uint64_t start_offset_items, uint64_t length_items) { - return gnuradio::get_initial_sptr(new file_source_impl( - itemsize, filename, repeat, start_offset_items, length_items)); + return gnuradio::make_block_sptr<file_source_impl>( + itemsize, filename, repeat, start_offset_items, length_items); } file_source_impl::file_source_impl(size_t itemsize, diff --git a/gr-blocks/lib/float_to_char_impl.cc b/gr-blocks/lib/float_to_char_impl.cc index 941cd81fd0..c5f304d9dd 100644 --- a/gr-blocks/lib/float_to_char_impl.cc +++ b/gr-blocks/lib/float_to_char_impl.cc @@ -21,7 +21,7 @@ namespace blocks { float_to_char::sptr float_to_char::make(size_t vlen, float scale) { - return gnuradio::get_initial_sptr(new float_to_char_impl(vlen, scale)); + return gnuradio::make_block_sptr<float_to_char_impl>(vlen, scale); } float_to_char_impl::float_to_char_impl(size_t vlen, float scale) diff --git a/gr-blocks/lib/float_to_complex_impl.cc b/gr-blocks/lib/float_to_complex_impl.cc index 86635edd51..fa932e601c 100644 --- a/gr-blocks/lib/float_to_complex_impl.cc +++ b/gr-blocks/lib/float_to_complex_impl.cc @@ -21,7 +21,7 @@ namespace blocks { float_to_complex::sptr float_to_complex::make(size_t vlen) { - return gnuradio::get_initial_sptr(new float_to_complex_impl(vlen)); + return gnuradio::make_block_sptr<float_to_complex_impl>(vlen); } float_to_complex_impl::float_to_complex_impl(size_t vlen) diff --git a/gr-blocks/lib/float_to_int_impl.cc b/gr-blocks/lib/float_to_int_impl.cc index b415a5f9cf..baf3163092 100644 --- a/gr-blocks/lib/float_to_int_impl.cc +++ b/gr-blocks/lib/float_to_int_impl.cc @@ -22,7 +22,7 @@ namespace blocks { float_to_int::sptr float_to_int::make(size_t vlen, float scale) { - return gnuradio::get_initial_sptr(new float_to_int_impl(vlen, scale)); + return gnuradio::make_block_sptr<float_to_int_impl>(vlen, scale); } float_to_int_impl::float_to_int_impl(size_t vlen, float scale) diff --git a/gr-blocks/lib/float_to_short_impl.cc b/gr-blocks/lib/float_to_short_impl.cc index c332119a8c..054c95f0ef 100644 --- a/gr-blocks/lib/float_to_short_impl.cc +++ b/gr-blocks/lib/float_to_short_impl.cc @@ -21,7 +21,7 @@ namespace blocks { float_to_short::sptr float_to_short::make(size_t vlen, float scale) { - return gnuradio::get_initial_sptr(new float_to_short_impl(vlen, scale)); + return gnuradio::make_block_sptr<float_to_short_impl>(vlen, scale); } float_to_short_impl::float_to_short_impl(size_t vlen, float scale) diff --git a/gr-blocks/lib/float_to_uchar_impl.cc b/gr-blocks/lib/float_to_uchar_impl.cc index 0fb6c93fe7..c620ae180e 100644 --- a/gr-blocks/lib/float_to_uchar_impl.cc +++ b/gr-blocks/lib/float_to_uchar_impl.cc @@ -21,7 +21,7 @@ namespace blocks { float_to_uchar::sptr float_to_uchar::make() { - return gnuradio::get_initial_sptr(new float_to_uchar_impl()); + return gnuradio::make_block_sptr<float_to_uchar_impl>(); } float_to_uchar_impl::float_to_uchar_impl() diff --git a/gr-blocks/lib/head_impl.cc b/gr-blocks/lib/head_impl.cc index 4b042559b3..85e32a60d9 100644 --- a/gr-blocks/lib/head_impl.cc +++ b/gr-blocks/lib/head_impl.cc @@ -21,7 +21,7 @@ namespace blocks { head::sptr head::make(size_t sizeof_stream_item, uint64_t nitems) { - return gnuradio::get_initial_sptr(new head_impl(sizeof_stream_item, nitems)); + return gnuradio::make_block_sptr<head_impl>(sizeof_stream_item, nitems); } head_impl::head_impl(size_t sizeof_stream_item, uint64_t nitems) diff --git a/gr-blocks/lib/int_to_float_impl.cc b/gr-blocks/lib/int_to_float_impl.cc index 28d319e1cc..520822ebe2 100644 --- a/gr-blocks/lib/int_to_float_impl.cc +++ b/gr-blocks/lib/int_to_float_impl.cc @@ -21,7 +21,7 @@ namespace blocks { int_to_float::sptr int_to_float::make(size_t vlen, float scale) { - return gnuradio::get_initial_sptr(new int_to_float_impl(vlen, scale)); + return gnuradio::make_block_sptr<int_to_float_impl>(vlen, scale); } int_to_float_impl::int_to_float_impl(size_t vlen, float scale) diff --git a/gr-blocks/lib/integrate_impl.cc b/gr-blocks/lib/integrate_impl.cc index d631ee6cf3..242af6725b 100644 --- a/gr-blocks/lib/integrate_impl.cc +++ b/gr-blocks/lib/integrate_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename integrate<T>::sptr integrate<T>::make(int decim, unsigned int vlen) { - return gnuradio::get_initial_sptr(new integrate_impl<T>(decim, vlen)); + return gnuradio::make_block_sptr<integrate_impl<T>>(decim, vlen); } template <class T> diff --git a/gr-blocks/lib/interleave_impl.cc b/gr-blocks/lib/interleave_impl.cc index 3d1dd53962..f7cf58bbf7 100644 --- a/gr-blocks/lib/interleave_impl.cc +++ b/gr-blocks/lib/interleave_impl.cc @@ -20,7 +20,7 @@ namespace blocks { interleave::sptr interleave::make(size_t itemsize, unsigned int blocksize) { - return gnuradio::get_initial_sptr(new interleave_impl(itemsize, blocksize)); + return gnuradio::make_block_sptr<interleave_impl>(itemsize, blocksize); } interleave_impl::interleave_impl(size_t itemsize, unsigned int blocksize) diff --git a/gr-blocks/lib/interleaved_char_to_complex_impl.cc b/gr-blocks/lib/interleaved_char_to_complex_impl.cc index cf24a22471..6688ed3aa6 100644 --- a/gr-blocks/lib/interleaved_char_to_complex_impl.cc +++ b/gr-blocks/lib/interleaved_char_to_complex_impl.cc @@ -22,8 +22,8 @@ namespace blocks { interleaved_char_to_complex::sptr interleaved_char_to_complex::make(bool vector_input, float scale_factor) { - return gnuradio::get_initial_sptr( - new interleaved_char_to_complex_impl(vector_input, scale_factor)); + return gnuradio::make_block_sptr<interleaved_char_to_complex_impl>(vector_input, + scale_factor); } interleaved_char_to_complex_impl::interleaved_char_to_complex_impl(bool vector_input, diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.cc b/gr-blocks/lib/interleaved_short_to_complex_impl.cc index 0e88a814e5..1aea1188d6 100644 --- a/gr-blocks/lib/interleaved_short_to_complex_impl.cc +++ b/gr-blocks/lib/interleaved_short_to_complex_impl.cc @@ -22,8 +22,8 @@ namespace blocks { interleaved_short_to_complex::sptr interleaved_short_to_complex::make(bool vector_input, bool swap, float scale_factor) { - return gnuradio::get_initial_sptr( - new interleaved_short_to_complex_impl(vector_input, swap, scale_factor)); + return gnuradio::make_block_sptr<interleaved_short_to_complex_impl>( + vector_input, swap, scale_factor); } interleaved_short_to_complex_impl::interleaved_short_to_complex_impl(bool vector_input, diff --git a/gr-blocks/lib/keep_m_in_n_impl.cc b/gr-blocks/lib/keep_m_in_n_impl.cc index 3f3608bf4e..9c56b10ba6 100644 --- a/gr-blocks/lib/keep_m_in_n_impl.cc +++ b/gr-blocks/lib/keep_m_in_n_impl.cc @@ -20,7 +20,7 @@ namespace blocks { keep_m_in_n::sptr keep_m_in_n::make(size_t itemsize, int m, int n, int offset) { - return gnuradio::get_initial_sptr(new keep_m_in_n_impl(itemsize, m, n, offset)); + return gnuradio::make_block_sptr<keep_m_in_n_impl>(itemsize, m, n, offset); } keep_m_in_n_impl::keep_m_in_n_impl(size_t itemsize, int m, int n, int offset) diff --git a/gr-blocks/lib/keep_one_in_n_impl.cc b/gr-blocks/lib/keep_one_in_n_impl.cc index 20ea05092e..7a6ea9cc48 100644 --- a/gr-blocks/lib/keep_one_in_n_impl.cc +++ b/gr-blocks/lib/keep_one_in_n_impl.cc @@ -20,7 +20,7 @@ namespace blocks { keep_one_in_n::sptr keep_one_in_n::make(size_t itemsize, int n) { - return gnuradio::get_initial_sptr(new keep_one_in_n_impl(itemsize, n)); + return gnuradio::make_block_sptr<keep_one_in_n_impl>(itemsize, n); } keep_one_in_n_impl::keep_one_in_n_impl(size_t itemsize, int n) diff --git a/gr-blocks/lib/lfsr_32k_source_s_impl.cc b/gr-blocks/lib/lfsr_32k_source_s_impl.cc index de813574ec..db7961e8e5 100644 --- a/gr-blocks/lib/lfsr_32k_source_s_impl.cc +++ b/gr-blocks/lib/lfsr_32k_source_s_impl.cc @@ -21,7 +21,7 @@ namespace blocks { lfsr_32k_source_s::sptr lfsr_32k_source_s::make() { - return gnuradio::get_initial_sptr(new lfsr_32k_source_s_impl()); + return gnuradio::make_block_sptr<lfsr_32k_source_s_impl>(); } lfsr_32k_source_s_impl::lfsr_32k_source_s_impl() diff --git a/gr-blocks/lib/magphase_to_complex_impl.cc b/gr-blocks/lib/magphase_to_complex_impl.cc index ac29204a3a..837b27212a 100644 --- a/gr-blocks/lib/magphase_to_complex_impl.cc +++ b/gr-blocks/lib/magphase_to_complex_impl.cc @@ -21,7 +21,7 @@ namespace blocks { magphase_to_complex::sptr magphase_to_complex::make(size_t vlen) { - return gnuradio::get_initial_sptr(new magphase_to_complex_impl(vlen)); + return gnuradio::make_block_sptr<magphase_to_complex_impl>(vlen); } magphase_to_complex_impl::magphase_to_complex_impl(size_t vlen) diff --git a/gr-blocks/lib/max_blk_impl.cc b/gr-blocks/lib/max_blk_impl.cc index 41f4cb0ea5..8ae7959a2a 100644 --- a/gr-blocks/lib/max_blk_impl.cc +++ b/gr-blocks/lib/max_blk_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename max_blk<T>::sptr max_blk<T>::make(size_t vlen, size_t vlen_out) { - return gnuradio::get_initial_sptr(new max_blk_impl<T>(vlen, vlen_out)); + return gnuradio::make_block_sptr<max_blk_impl<T>>(vlen, vlen_out); } template <class T> diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc index eb47fee299..299dd47d09 100644 --- a/gr-blocks/lib/message_debug_impl.cc +++ b/gr-blocks/lib/message_debug_impl.cc @@ -22,7 +22,7 @@ namespace blocks { message_debug::sptr message_debug::make() { - return gnuradio::get_initial_sptr(new message_debug_impl()); + return gnuradio::make_block_sptr<message_debug_impl>(); } void message_debug_impl::print(pmt::pmt_t msg) diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc index 33215a5a81..8980d43530 100644 --- a/gr-blocks/lib/message_strobe_impl.cc +++ b/gr-blocks/lib/message_strobe_impl.cc @@ -28,7 +28,7 @@ namespace blocks { message_strobe::sptr message_strobe::make(pmt::pmt_t msg, long period_ms) { - return gnuradio::get_initial_sptr(new message_strobe_impl(msg, period_ms)); + return gnuradio::make_block_sptr<message_strobe_impl>(msg, period_ms); } message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, long period_ms) diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc index 1c2b4ec2a1..94515f9e0e 100644 --- a/gr-blocks/lib/message_strobe_random_impl.cc +++ b/gr-blocks/lib/message_strobe_random_impl.cc @@ -24,8 +24,8 @@ message_strobe_random::make(pmt::pmt_t msg, float mean_ms, float std_ms) { - return gnuradio::get_initial_sptr( - new message_strobe_random_impl(msg, dist, mean_ms, std_ms)); + return gnuradio::make_block_sptr<message_strobe_random_impl>( + msg, dist, mean_ms, std_ms); } diff --git a/gr-blocks/lib/min_blk_impl.cc b/gr-blocks/lib/min_blk_impl.cc index 4d6f319f85..88379f58f1 100644 --- a/gr-blocks/lib/min_blk_impl.cc +++ b/gr-blocks/lib/min_blk_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename min_blk<T>::sptr min_blk<T>::make(size_t vlen, size_t vlen_out) { - return gnuradio::get_initial_sptr(new min_blk_impl<T>(vlen, vlen_out)); + return gnuradio::make_block_sptr<min_blk_impl<T>>(vlen, vlen_out); } template <class T> diff --git a/gr-blocks/lib/moving_average_impl.cc b/gr-blocks/lib/moving_average_impl.cc index 7a566bac2e..ccb7d6963b 100644 --- a/gr-blocks/lib/moving_average_impl.cc +++ b/gr-blocks/lib/moving_average_impl.cc @@ -104,8 +104,8 @@ template <class T> typename moving_average<T>::sptr moving_average<T>::make(int length, T scale, int max_iter, unsigned int vlen) { - return gnuradio::get_initial_sptr( - new moving_average_impl<T>(length, scale, max_iter, vlen)); + return gnuradio::make_block_sptr<moving_average_impl<T>>( + length, scale, max_iter, vlen); } template <class T> diff --git a/gr-blocks/lib/multiply_by_tag_value_cc_impl.cc b/gr-blocks/lib/multiply_by_tag_value_cc_impl.cc index cc7245fe04..25b6e77cb5 100644 --- a/gr-blocks/lib/multiply_by_tag_value_cc_impl.cc +++ b/gr-blocks/lib/multiply_by_tag_value_cc_impl.cc @@ -22,7 +22,7 @@ namespace blocks { multiply_by_tag_value_cc::sptr multiply_by_tag_value_cc::make(const std::string& tag_name, size_t vlen) { - return gnuradio::get_initial_sptr(new multiply_by_tag_value_cc_impl(tag_name, vlen)); + return gnuradio::make_block_sptr<multiply_by_tag_value_cc_impl>(tag_name, vlen); } multiply_by_tag_value_cc_impl::multiply_by_tag_value_cc_impl(const std::string& tag_name, diff --git a/gr-blocks/lib/multiply_conjugate_cc_impl.cc b/gr-blocks/lib/multiply_conjugate_cc_impl.cc index af14ee8523..18c513d479 100644 --- a/gr-blocks/lib/multiply_conjugate_cc_impl.cc +++ b/gr-blocks/lib/multiply_conjugate_cc_impl.cc @@ -21,7 +21,7 @@ namespace blocks { multiply_conjugate_cc::sptr multiply_conjugate_cc::make(size_t vlen) { - return gnuradio::get_initial_sptr(new multiply_conjugate_cc_impl(vlen)); + return gnuradio::make_block_sptr<multiply_conjugate_cc_impl>(vlen); } multiply_conjugate_cc_impl::multiply_conjugate_cc_impl(size_t vlen) diff --git a/gr-blocks/lib/multiply_const_impl.cc b/gr-blocks/lib/multiply_const_impl.cc index cc66cc04a6..8dc4cd2232 100644 --- a/gr-blocks/lib/multiply_const_impl.cc +++ b/gr-blocks/lib/multiply_const_impl.cc @@ -23,7 +23,7 @@ namespace blocks { template <class T> typename multiply_const<T>::sptr multiply_const<T>::make(T k, size_t vlen) { - return gnuradio::get_initial_sptr(new multiply_const_impl<T>(k, vlen)); + return gnuradio::make_block_sptr<multiply_const_impl<T>>(k, vlen); } template <> diff --git a/gr-blocks/lib/multiply_const_v_impl.cc b/gr-blocks/lib/multiply_const_v_impl.cc index 1a909dcc18..34066b000a 100644 --- a/gr-blocks/lib/multiply_const_v_impl.cc +++ b/gr-blocks/lib/multiply_const_v_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename multiply_const_v<T>::sptr multiply_const_v<T>::make(std::vector<T> k) { - return gnuradio::get_initial_sptr(new multiply_const_v_impl<T>(k)); + return gnuradio::make_block_sptr<multiply_const_v_impl<T>>(k); } template <> diff --git a/gr-blocks/lib/multiply_impl.cc b/gr-blocks/lib/multiply_impl.cc index 2016ef29fb..a92d08483c 100644 --- a/gr-blocks/lib/multiply_impl.cc +++ b/gr-blocks/lib/multiply_impl.cc @@ -23,7 +23,7 @@ namespace blocks { template <class T> typename multiply<T>::sptr multiply<T>::make(size_t vlen) { - return gnuradio::get_initial_sptr(new multiply_impl<T>(vlen)); + return gnuradio::make_block_sptr<multiply_impl<T>>(vlen); } template <> diff --git a/gr-blocks/lib/multiply_matrix_impl.cc b/gr-blocks/lib/multiply_matrix_impl.cc index 539432eac8..89e344f23c 100644 --- a/gr-blocks/lib/multiply_matrix_impl.cc +++ b/gr-blocks/lib/multiply_matrix_impl.cc @@ -203,8 +203,7 @@ multiply_matrix<T>::make(std::vector<std::vector<T>> A, if (A.empty() || A[0].empty()) { throw std::invalid_argument("matrix A has invalid dimensions."); } - return gnuradio::get_initial_sptr( - new multiply_matrix_impl<T>(A, tag_propagation_policy)); + return gnuradio::make_block_sptr<multiply_matrix_impl<T>>(A, tag_propagation_policy); } template <> diff --git a/gr-blocks/lib/mute_impl.cc b/gr-blocks/lib/mute_impl.cc index 003f33c46f..db78fb2af1 100644 --- a/gr-blocks/lib/mute_impl.cc +++ b/gr-blocks/lib/mute_impl.cc @@ -24,7 +24,7 @@ namespace blocks { template <class T> typename mute_blk<T>::sptr mute_blk<T>::make(bool mute) { - return gnuradio::get_initial_sptr(new mute_impl<T>(mute)); + return gnuradio::make_block_sptr<mute_impl<T>>(mute); } template <class T> diff --git a/gr-blocks/lib/nlog10_ff_impl.cc b/gr-blocks/lib/nlog10_ff_impl.cc index 847a7a6019..f92634fdd5 100644 --- a/gr-blocks/lib/nlog10_ff_impl.cc +++ b/gr-blocks/lib/nlog10_ff_impl.cc @@ -22,7 +22,7 @@ namespace blocks { nlog10_ff::sptr nlog10_ff::make(float n, size_t vlen, float k) { - return gnuradio::get_initial_sptr(new nlog10_ff_impl(n, vlen, k)); + return gnuradio::make_block_sptr<nlog10_ff_impl>(n, vlen, k); } nlog10_ff_impl::nlog10_ff_impl(float n, size_t vlen, float k) diff --git a/gr-blocks/lib/nop_impl.cc b/gr-blocks/lib/nop_impl.cc index 5ed25f5d1a..982438ee4d 100644 --- a/gr-blocks/lib/nop_impl.cc +++ b/gr-blocks/lib/nop_impl.cc @@ -21,7 +21,7 @@ namespace blocks { nop::sptr nop::make(size_t sizeof_stream_item) { - return gnuradio::get_initial_sptr(new nop_impl(sizeof_stream_item)); + return gnuradio::make_block_sptr<nop_impl>(sizeof_stream_item); } nop_impl::nop_impl(size_t sizeof_stream_item) diff --git a/gr-blocks/lib/not_blk_impl.cc b/gr-blocks/lib/not_blk_impl.cc index 0915b47cb5..803af4e3c4 100644 --- a/gr-blocks/lib/not_blk_impl.cc +++ b/gr-blocks/lib/not_blk_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename not_blk<T>::sptr not_blk<T>::make(size_t vlen) { - return gnuradio::get_initial_sptr(new not_blk_impl<T>(vlen)); + return gnuradio::make_block_sptr<not_blk_impl<T>>(vlen); } template <class T> diff --git a/gr-blocks/lib/null_sink_impl.cc b/gr-blocks/lib/null_sink_impl.cc index be7ea2c6a4..d8071d6141 100644 --- a/gr-blocks/lib/null_sink_impl.cc +++ b/gr-blocks/lib/null_sink_impl.cc @@ -20,7 +20,7 @@ namespace blocks { null_sink::sptr null_sink::make(size_t sizeof_stream_item) { - return gnuradio::get_initial_sptr(new null_sink_impl(sizeof_stream_item)); + return gnuradio::make_block_sptr<null_sink_impl>(sizeof_stream_item); } null_sink_impl::null_sink_impl(size_t sizeof_stream_item) diff --git a/gr-blocks/lib/or_blk_impl.cc b/gr-blocks/lib/or_blk_impl.cc index 8505729fed..4d4532a265 100644 --- a/gr-blocks/lib/or_blk_impl.cc +++ b/gr-blocks/lib/or_blk_impl.cc @@ -21,7 +21,7 @@ namespace blocks { template <class T> typename or_blk<T>::sptr or_blk<T>::make(size_t vlen) { - return gnuradio::get_initial_sptr(new or_blk_impl<T>(vlen)); + return gnuradio::make_block_sptr<or_blk_impl<T>>(vlen); } template <class T> diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.cc b/gr-blocks/lib/pack_k_bits_bb_impl.cc index 831bd40463..896b077d78 100644 --- a/gr-blocks/lib/pack_k_bits_bb_impl.cc +++ b/gr-blocks/lib/pack_k_bits_bb_impl.cc @@ -22,7 +22,7 @@ namespace blocks { pack_k_bits_bb::sptr pack_k_bits_bb::make(unsigned k) { - return gnuradio::get_initial_sptr(new pack_k_bits_bb_impl(k)); + return gnuradio::make_block_sptr<pack_k_bits_bb_impl>(k); } pack_k_bits_bb_impl::pack_k_bits_bb_impl(unsigned k) diff --git a/gr-blocks/lib/packed_to_unpacked_impl.cc b/gr-blocks/lib/packed_to_unpacked_impl.cc index e982300540..03a80aa44c 100644 --- a/gr-blocks/lib/packed_to_unpacked_impl.cc +++ b/gr-blocks/lib/packed_to_unpacked_impl.cc @@ -24,8 +24,8 @@ template <class T> typename packed_to_unpacked<T>::sptr packed_to_unpacked<T>::make(unsigned int bits_per_chunk, endianness_t endianness) { - return gnuradio::get_initial_sptr( - new packed_to_unpacked_impl<T>(bits_per_chunk, endianness)); + return gnuradio::make_block_sptr<packed_to_unpacked_impl<T>>(bits_per_chunk, + endianness); } template <class T> diff --git a/gr-blocks/lib/patterned_interleaver_impl.cc b/gr-blocks/lib/patterned_interleaver_impl.cc index e38ba5099a..ecc41e33da 100644 --- a/gr-blocks/lib/patterned_interleaver_impl.cc +++ b/gr-blocks/lib/patterned_interleaver_impl.cc @@ -21,7 +21,7 @@ namespace blocks { patterned_interleaver::sptr patterned_interleaver::make(size_t itemsize, std::vector<int> pattern) { - return gnuradio::get_initial_sptr(new patterned_interleaver_impl(itemsize, pattern)); + return gnuradio::make_block_sptr<patterned_interleaver_impl>(itemsize, pattern); } patterned_interleaver_impl::patterned_interleaver_impl(size_t itemsize, diff --git a/gr-blocks/lib/pdu_filter_impl.cc b/gr-blocks/lib/pdu_filter_impl.cc index dcf83a8d2e..686e7b678d 100644 --- a/gr-blocks/lib/pdu_filter_impl.cc +++ b/gr-blocks/lib/pdu_filter_impl.cc @@ -21,7 +21,7 @@ namespace blocks { pdu_filter::sptr pdu_filter::make(pmt::pmt_t k, pmt::pmt_t v, bool invert) { - return gnuradio::get_initial_sptr(new pdu_filter_impl(k, v, invert)); + return gnuradio::make_block_sptr<pdu_filter_impl>(k, v, invert); } pdu_filter_impl::pdu_filter_impl(pmt::pmt_t k, pmt::pmt_t v, bool invert) diff --git a/gr-blocks/lib/pdu_remove_impl.cc b/gr-blocks/lib/pdu_remove_impl.cc index 55a3b7237e..ded25b6d49 100644 --- a/gr-blocks/lib/pdu_remove_impl.cc +++ b/gr-blocks/lib/pdu_remove_impl.cc @@ -21,7 +21,7 @@ namespace blocks { pdu_remove::sptr pdu_remove::make(pmt::pmt_t k) { - return gnuradio::get_initial_sptr(new pdu_remove_impl(k)); + return gnuradio::make_block_sptr<pdu_remove_impl>(k); } pdu_remove_impl::pdu_remove_impl(pmt::pmt_t k) diff --git a/gr-blocks/lib/pdu_set_impl.cc b/gr-blocks/lib/pdu_set_impl.cc index 61bcef7169..70a8487720 100644 --- a/gr-blocks/lib/pdu_set_impl.cc +++ b/gr-blocks/lib/pdu_set_impl.cc @@ -21,7 +21,7 @@ namespace blocks { pdu_set::sptr pdu_set::make(pmt::pmt_t k, pmt::pmt_t v) { - return gnuradio::get_initial_sptr(new pdu_set_impl(k, v)); + return gnuradio::make_block_sptr<pdu_set_impl>(k, v); } pdu_set_impl::pdu_set_impl(pmt::pmt_t k, pmt::pmt_t v) diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc index cca4489065..26b86bee83 100644 --- a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc +++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc @@ -22,7 +22,7 @@ namespace blocks { pdu_to_tagged_stream::sptr pdu_to_tagged_stream::make(pdu::vector_type type, const std::string& tsb_tag_key) { - return gnuradio::get_initial_sptr(new pdu_to_tagged_stream_impl(type, tsb_tag_key)); + return gnuradio::make_block_sptr<pdu_to_tagged_stream_impl>(type, tsb_tag_key); } pdu_to_tagged_stream_impl::pdu_to_tagged_stream_impl(pdu::vector_type type, diff --git a/gr-blocks/lib/peak_detector2_fb_impl.cc b/gr-blocks/lib/peak_detector2_fb_impl.cc index 84bd8f42c4..d0de85ca07 100644 --- a/gr-blocks/lib/peak_detector2_fb_impl.cc +++ b/gr-blocks/lib/peak_detector2_fb_impl.cc @@ -23,8 +23,8 @@ namespace blocks { peak_detector2_fb::sptr peak_detector2_fb::make(float threshold_factor_rise, int look_ahead, float alpha) { - return gnuradio::get_initial_sptr( - new peak_detector2_fb_impl(threshold_factor_rise, look_ahead, alpha)); + return gnuradio::make_block_sptr<peak_detector2_fb_impl>( + threshold_factor_rise, look_ahead, alpha); } peak_detector2_fb_impl::peak_detector2_fb_impl(float threshold_factor_rise, diff --git a/gr-blocks/lib/peak_detector_impl.cc b/gr-blocks/lib/peak_detector_impl.cc index 1967e4416e..236f1d084c 100644 --- a/gr-blocks/lib/peak_detector_impl.cc +++ b/gr-blocks/lib/peak_detector_impl.cc @@ -49,8 +49,8 @@ typename peak_detector<T>::sptr peak_detector<T>::make(float threshold_factor_ri int look_ahead, float alpha) { - return gnuradio::get_initial_sptr(new peak_detector_impl<T>( - threshold_factor_rise, threshold_factor_fall, look_ahead, alpha)); + return gnuradio::make_block_sptr<peak_detector_impl<T>>( + threshold_factor_rise, threshold_factor_fall, look_ahead, alpha); } template <class T> diff --git a/gr-blocks/lib/phase_shift_impl.cc b/gr-blocks/lib/phase_shift_impl.cc index b81b78d6c4..5b648b5eb9 100644 --- a/gr-blocks/lib/phase_shift_impl.cc +++ b/gr-blocks/lib/phase_shift_impl.cc @@ -23,7 +23,7 @@ namespace blocks { phase_shift::sptr phase_shift::make(float shift, bool is_radians) { - return gnuradio::get_initial_sptr(new phase_shift_impl(shift, is_radians)); + return gnuradio::make_block_sptr<phase_shift_impl>(shift, is_radians); } /* diff --git a/gr-blocks/lib/plateau_detector_fb_impl.cc b/gr-blocks/lib/plateau_detector_fb_impl.cc index d7f70df211..8c3a640a9e 100644 --- a/gr-blocks/lib/plateau_detector_fb_impl.cc +++ b/gr-blocks/lib/plateau_detector_fb_impl.cc @@ -20,7 +20,7 @@ namespace blocks { plateau_detector_fb::sptr plateau_detector_fb::make(int max_len, float threshold) { - return gnuradio::get_initial_sptr(new plateau_detector_fb_impl(max_len, threshold)); + return gnuradio::make_block_sptr<plateau_detector_fb_impl>(max_len, threshold); } plateau_detector_fb_impl::plateau_detector_fb_impl(int max_len, float threshold) diff --git a/gr-blocks/lib/probe_rate_impl.cc b/gr-blocks/lib/probe_rate_impl.cc index 15c324bd6f..4bd1b5fada 100644 --- a/gr-blocks/lib/probe_rate_impl.cc +++ b/gr-blocks/lib/probe_rate_impl.cc @@ -20,8 +20,7 @@ namespace blocks { probe_rate::sptr probe_rate::make(size_t itemsize, double update_rate_ms, double alpha) { - return gnuradio::get_initial_sptr( - new probe_rate_impl(itemsize, update_rate_ms, alpha)); + return gnuradio::make_block_sptr<probe_rate_impl>(itemsize, update_rate_ms, alpha); } probe_rate_impl::probe_rate_impl(size_t itemsize, double update_rate_ms, double alpha) diff --git a/gr-blocks/lib/probe_signal_impl.cc b/gr-blocks/lib/probe_signal_impl.cc index 84315638fa..f3bb366aea 100644 --- a/gr-blocks/lib/probe_signal_impl.cc +++ b/gr-blocks/lib/probe_signal_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename probe_signal<T>::sptr probe_signal<T>::make() { - return gnuradio::get_initial_sptr(new probe_signal_impl<T>()); + return gnuradio::make_block_sptr<probe_signal_impl<T>>(); } template <class T> diff --git a/gr-blocks/lib/probe_signal_v_impl.cc b/gr-blocks/lib/probe_signal_v_impl.cc index dc1a958adb..349e0bbb68 100644 --- a/gr-blocks/lib/probe_signal_v_impl.cc +++ b/gr-blocks/lib/probe_signal_v_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename probe_signal_v<T>::sptr probe_signal_v<T>::make(size_t size) { - return gnuradio::get_initial_sptr(new probe_signal_v_impl<T>(size)); + return gnuradio::make_block_sptr<probe_signal_v_impl<T>>(size); } template <class T> diff --git a/gr-blocks/lib/qa_gr_flowgraph.cc b/gr-blocks/lib/qa_gr_flowgraph.cc index 6eb5e4224a..596d0d14c7 100644 --- a/gr-blocks/lib/qa_gr_flowgraph.cc +++ b/gr-blocks/lib/qa_gr_flowgraph.cc @@ -51,7 +51,7 @@ public: }; null_qa_source::sptr null_qa_source::make(size_t sizeof_stream_item) { - return gnuradio::get_initial_sptr(new null_source_qa_impl(sizeof_stream_item)); + return gnuradio::make_block_sptr<null_source_qa_impl>(sizeof_stream_item); } class null_qa_sink : virtual public sync_block { @@ -78,7 +78,7 @@ public: }; null_qa_sink::sptr null_qa_sink::make(size_t sizeof_stream_item) { - return gnuradio::get_initial_sptr(new null_sink_qa_impl(sizeof_stream_item)); + return gnuradio::make_block_sptr<null_sink_qa_impl>(sizeof_stream_item); } } /* namespace blocks */ } /* namespace gr */ diff --git a/gr-blocks/lib/qa_gr_hier_block2_derived.cc b/gr-blocks/lib/qa_gr_hier_block2_derived.cc index b2af4921c6..a1a0ede624 100644 --- a/gr-blocks/lib/qa_gr_hier_block2_derived.cc +++ b/gr-blocks/lib/qa_gr_hier_block2_derived.cc @@ -29,7 +29,9 @@ gr_derived_block_sptr gr_make_derived_block(); class gr_derived_block : public gr::hier_block2 { private: - friend gr_derived_block_sptr gr_make_derived_block(); + template <typename T, typename... Args> + friend std::shared_ptr<T> gnuradio::make_block_sptr(Args&&... args); + gr_derived_block(); public: @@ -39,7 +41,7 @@ public: gr_derived_block_sptr gr_make_derived_block() { - return gnuradio::get_initial_sptr(new gr_derived_block()); + return gnuradio::make_block_sptr<gr_derived_block>(); } gr_derived_block::gr_derived_block() diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc index 2ee9b89759..2a8e1eb7f5 100644 --- a/gr-blocks/lib/random_pdu_impl.cc +++ b/gr-blocks/lib/random_pdu_impl.cc @@ -22,8 +22,8 @@ namespace blocks { random_pdu::sptr random_pdu::make(int min_items, int max_items, unsigned char byte_mask, int length_modulo) { - return gnuradio::get_initial_sptr( - new random_pdu_impl(min_items, max_items, byte_mask, length_modulo)); + return gnuradio::make_block_sptr<random_pdu_impl>( + min_items, max_items, byte_mask, length_modulo); } random_pdu_impl::random_pdu_impl(int min_items, diff --git a/gr-blocks/lib/regenerate_bb_impl.cc b/gr-blocks/lib/regenerate_bb_impl.cc index d340cab6b7..a981c8f182 100644 --- a/gr-blocks/lib/regenerate_bb_impl.cc +++ b/gr-blocks/lib/regenerate_bb_impl.cc @@ -20,7 +20,7 @@ namespace blocks { regenerate_bb::sptr regenerate_bb::make(int period, unsigned int max_regen) { - return gnuradio::get_initial_sptr(new regenerate_bb_impl(period, max_regen)); + return gnuradio::make_block_sptr<regenerate_bb_impl>(period, max_regen); } regenerate_bb_impl::regenerate_bb_impl(int period, unsigned int max_regen) diff --git a/gr-blocks/lib/repack_bits_bb_impl.cc b/gr-blocks/lib/repack_bits_bb_impl.cc index d78a4fd8f5..e23b7f7297 100644 --- a/gr-blocks/lib/repack_bits_bb_impl.cc +++ b/gr-blocks/lib/repack_bits_bb_impl.cc @@ -24,8 +24,8 @@ repack_bits_bb::sptr repack_bits_bb::make(int k, bool align_output, endianness_t endianness) { - return gnuradio::get_initial_sptr( - new repack_bits_bb_impl(k, l, len_tag_key, align_output, endianness)); + return gnuradio::make_block_sptr<repack_bits_bb_impl>( + k, l, len_tag_key, align_output, endianness); } repack_bits_bb_impl::repack_bits_bb_impl(int k, diff --git a/gr-blocks/lib/repeat_impl.cc b/gr-blocks/lib/repeat_impl.cc index 3717290687..76b4d1df4e 100644 --- a/gr-blocks/lib/repeat_impl.cc +++ b/gr-blocks/lib/repeat_impl.cc @@ -20,7 +20,7 @@ namespace blocks { repeat::sptr repeat::make(size_t itemsize, int interp) { - return gnuradio::get_initial_sptr(new repeat_impl(itemsize, interp)); + return gnuradio::make_block_sptr<repeat_impl>(itemsize, interp); } repeat_impl::repeat_impl(size_t itemsize, int interp) diff --git a/gr-blocks/lib/rms_cf_impl.cc b/gr-blocks/lib/rms_cf_impl.cc index afe452acc7..36f166ed6a 100644 --- a/gr-blocks/lib/rms_cf_impl.cc +++ b/gr-blocks/lib/rms_cf_impl.cc @@ -21,7 +21,7 @@ namespace blocks { rms_cf::sptr rms_cf::make(double alpha) { - return gnuradio::get_initial_sptr(new rms_cf_impl(alpha)); + return gnuradio::make_block_sptr<rms_cf_impl>(alpha); } rms_cf_impl::rms_cf_impl(double alpha) diff --git a/gr-blocks/lib/rms_ff_impl.cc b/gr-blocks/lib/rms_ff_impl.cc index 9b9c4d26cb..9819906fc9 100644 --- a/gr-blocks/lib/rms_ff_impl.cc +++ b/gr-blocks/lib/rms_ff_impl.cc @@ -21,7 +21,7 @@ namespace blocks { rms_ff::sptr rms_ff::make(double alpha) { - return gnuradio::get_initial_sptr(new rms_ff_impl(alpha)); + return gnuradio::make_block_sptr<rms_ff_impl>(alpha); } rms_ff_impl::rms_ff_impl(double alpha) diff --git a/gr-blocks/lib/rotator_cc_impl.cc b/gr-blocks/lib/rotator_cc_impl.cc index 9b9e2ad302..d7d9fa92cf 100644 --- a/gr-blocks/lib/rotator_cc_impl.cc +++ b/gr-blocks/lib/rotator_cc_impl.cc @@ -22,7 +22,7 @@ namespace blocks { rotator_cc::sptr rotator_cc::make(double phase_inc) { - return gnuradio::get_initial_sptr(new rotator_cc_impl(phase_inc)); + return gnuradio::make_block_sptr<rotator_cc_impl>(phase_inc); } rotator_cc_impl::rotator_cc_impl(double phase_inc) diff --git a/gr-blocks/lib/sample_and_hold_impl.cc b/gr-blocks/lib/sample_and_hold_impl.cc index 3c85d90891..90623cd2b2 100644 --- a/gr-blocks/lib/sample_and_hold_impl.cc +++ b/gr-blocks/lib/sample_and_hold_impl.cc @@ -22,7 +22,7 @@ namespace blocks { template <class T> typename sample_and_hold<T>::sptr sample_and_hold<T>::make() { - return gnuradio::get_initial_sptr(new sample_and_hold_impl<T>()); + return gnuradio::make_block_sptr<sample_and_hold_impl<T>>(); } template <class T> diff --git a/gr-blocks/lib/selector_impl.cc b/gr-blocks/lib/selector_impl.cc index 01cb82d07b..d8f5aa8958 100644 --- a/gr-blocks/lib/selector_impl.cc +++ b/gr-blocks/lib/selector_impl.cc @@ -23,8 +23,7 @@ namespace blocks { selector::sptr selector::make(size_t itemsize, unsigned int input_index, unsigned int output_index) { - return gnuradio::get_initial_sptr( - new selector_impl(itemsize, input_index, output_index)); + return gnuradio::make_block_sptr<selector_impl>(itemsize, input_index, output_index); } selector_impl::selector_impl(size_t itemsize, diff --git a/gr-blocks/lib/short_to_char_impl.cc b/gr-blocks/lib/short_to_char_impl.cc index 984269cdc5..9cc5af724e 100644 --- a/gr-blocks/lib/short_to_char_impl.cc +++ b/gr-blocks/lib/short_to_char_impl.cc @@ -21,7 +21,7 @@ namespace blocks { short_to_char::sptr short_to_char::make(size_t vlen) { - return gnuradio::get_initial_sptr(new short_to_char_impl(vlen)); + return gnuradio::make_block_sptr<short_to_char_impl>(vlen); } short_to_char_impl::short_to_char_impl(size_t vlen) diff --git a/gr-blocks/lib/short_to_float_impl.cc b/gr-blocks/lib/short_to_float_impl.cc index 15b5d5a9b1..0603ccf921 100644 --- a/gr-blocks/lib/short_to_float_impl.cc +++ b/gr-blocks/lib/short_to_float_impl.cc @@ -21,7 +21,7 @@ namespace blocks { short_to_float::sptr short_to_float::make(size_t vlen, float scale) { - return gnuradio::get_initial_sptr(new short_to_float_impl(vlen, scale)); + return gnuradio::make_block_sptr<short_to_float_impl>(vlen, scale); } short_to_float_impl::short_to_float_impl(size_t vlen, float scale) diff --git a/gr-blocks/lib/skiphead_impl.cc b/gr-blocks/lib/skiphead_impl.cc index 2cf431eb1d..b1d2b9b3f1 100644 --- a/gr-blocks/lib/skiphead_impl.cc +++ b/gr-blocks/lib/skiphead_impl.cc @@ -21,7 +21,7 @@ namespace blocks { skiphead::sptr skiphead::make(size_t itemsize, uint64_t nitems_to_skip) { - return gnuradio::get_initial_sptr(new skiphead_impl(itemsize, nitems_to_skip)); + return gnuradio::make_block_sptr<skiphead_impl>(itemsize, nitems_to_skip); } skiphead_impl::skiphead_impl(size_t itemsize, uint64_t nitems_to_skip) diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc index bdbe1eb2d2..60c1a90b38 100644 --- a/gr-blocks/lib/socket_pdu_impl.cc +++ b/gr-blocks/lib/socket_pdu_impl.cc @@ -26,8 +26,8 @@ socket_pdu::sptr socket_pdu::make(std::string type, int MTU /*= 10000*/, bool tcp_no_delay /*= false*/) { - return gnuradio::get_initial_sptr( - new socket_pdu_impl(type, addr, port, MTU, tcp_no_delay)); + return gnuradio::make_block_sptr<socket_pdu_impl>( + type, addr, port, MTU, tcp_no_delay); } socket_pdu_impl::socket_pdu_impl(std::string type, diff --git a/gr-blocks/lib/stream_mux_impl.cc b/gr-blocks/lib/stream_mux_impl.cc index 42a0b1f27e..2cb2a1438a 100644 --- a/gr-blocks/lib/stream_mux_impl.cc +++ b/gr-blocks/lib/stream_mux_impl.cc @@ -21,7 +21,7 @@ namespace blocks { stream_mux::sptr stream_mux::make(size_t itemsize, const std::vector<int>& lengths) { - return gnuradio::get_initial_sptr(new stream_mux_impl(itemsize, lengths)); + return gnuradio::make_block_sptr<stream_mux_impl>(itemsize, lengths); } stream_mux_impl::stream_mux_impl(size_t itemsize, const std::vector<int>& lengths) diff --git a/gr-blocks/lib/stream_to_streams_impl.cc b/gr-blocks/lib/stream_to_streams_impl.cc index a81cb82695..ad63547458 100644 --- a/gr-blocks/lib/stream_to_streams_impl.cc +++ b/gr-blocks/lib/stream_to_streams_impl.cc @@ -21,7 +21,7 @@ namespace blocks { stream_to_streams::sptr stream_to_streams::make(size_t itemsize, size_t nstreams) { - return gnuradio::get_initial_sptr(new stream_to_streams_impl(itemsize, nstreams)); + return gnuradio::make_block_sptr<stream_to_streams_impl>(itemsize, nstreams); } stream_to_streams_impl::stream_to_streams_impl(size_t itemsize, size_t nstreams) diff --git a/gr-blocks/lib/stream_to_tagged_stream_impl.cc b/gr-blocks/lib/stream_to_tagged_stream_impl.cc index c9d142a597..0106cb95a5 100644 --- a/gr-blocks/lib/stream_to_tagged_stream_impl.cc +++ b/gr-blocks/lib/stream_to_tagged_stream_impl.cc @@ -25,8 +25,8 @@ stream_to_tagged_stream::make(size_t itemsize, unsigned packet_len, const std::string& len_tag_key) { - return gnuradio::get_initial_sptr( - new stream_to_tagged_stream_impl(itemsize, vlen, packet_len, len_tag_key)); + return gnuradio::make_block_sptr<stream_to_tagged_stream_impl>( + itemsize, vlen, packet_len, len_tag_key); } stream_to_tagged_stream_impl::stream_to_tagged_stream_impl(size_t itemsize, diff --git a/gr-blocks/lib/stream_to_vector_impl.cc b/gr-blocks/lib/stream_to_vector_impl.cc index cb6da1e763..e62f7d566d 100644 --- a/gr-blocks/lib/stream_to_vector_impl.cc +++ b/gr-blocks/lib/stream_to_vector_impl.cc @@ -20,8 +20,7 @@ namespace blocks { stream_to_vector::sptr stream_to_vector::make(size_t itemsize, size_t nitems_per_block) { - return gnuradio::get_initial_sptr( - new stream_to_vector_impl(itemsize, nitems_per_block)); + return gnuradio::make_block_sptr<stream_to_vector_impl>(itemsize, nitems_per_block); } stream_to_vector_impl::stream_to_vector_impl(size_t itemsize, size_t nitems_per_block) diff --git a/gr-blocks/lib/streams_to_stream_impl.cc b/gr-blocks/lib/streams_to_stream_impl.cc index e8358985be..09a28a8cbd 100644 --- a/gr-blocks/lib/streams_to_stream_impl.cc +++ b/gr-blocks/lib/streams_to_stream_impl.cc @@ -20,7 +20,7 @@ namespace blocks { streams_to_stream::sptr streams_to_stream::make(size_t itemsize, size_t nstreams) { - return gnuradio::get_initial_sptr(new streams_to_stream_impl(itemsize, nstreams)); + return gnuradio::make_block_sptr<streams_to_stream_impl>(itemsize, nstreams); } streams_to_stream_impl::streams_to_stream_impl(size_t itemsize, size_t nstreams) diff --git a/gr-blocks/lib/streams_to_vector_impl.cc b/gr-blocks/lib/streams_to_vector_impl.cc index 7f1b21aa93..8d02f980d6 100644 --- a/gr-blocks/lib/streams_to_vector_impl.cc +++ b/gr-blocks/lib/streams_to_vector_impl.cc @@ -20,7 +20,7 @@ namespace blocks { streams_to_vector::sptr streams_to_vector::make(size_t itemsize, size_t nstreams) { - return gnuradio::get_initial_sptr(new streams_to_vector_impl(itemsize, nstreams)); + return gnuradio::make_block_sptr<streams_to_vector_impl>(itemsize, nstreams); } streams_to_vector_impl::streams_to_vector_impl(size_t itemsize, size_t nstreams) diff --git a/gr-blocks/lib/stretch_ff_impl.cc b/gr-blocks/lib/stretch_ff_impl.cc index 7ee84879ba..00458c4742 100644 --- a/gr-blocks/lib/stretch_ff_impl.cc +++ b/gr-blocks/lib/stretch_ff_impl.cc @@ -20,7 +20,7 @@ namespace blocks { stretch_ff::sptr stretch_ff::make(float lo, size_t vlen) { - return gnuradio::get_initial_sptr(new stretch_ff_impl(lo, vlen)); + return gnuradio::make_block_sptr<stretch_ff_impl>(lo, vlen); } stretch_ff_impl::stretch_ff_impl(float lo, size_t vlen) diff --git a/gr-blocks/lib/sub_impl.cc b/gr-blocks/lib/sub_impl.cc index c2ef3449f9..510bed73c6 100644 --- a/gr-blocks/lib/sub_impl.cc +++ b/gr-blocks/lib/sub_impl.cc @@ -23,7 +23,7 @@ namespace blocks { template <class T> typename sub<T>::sptr sub<T>::make(size_t vlen) { - return gnuradio::get_initial_sptr(new sub_impl<T>(vlen)); + return gnuradio::make_block_sptr<sub_impl<T>>(vlen); } template <> diff --git a/gr-blocks/lib/tag_debug_impl.cc b/gr-blocks/lib/tag_debug_impl.cc index 0c92e677b7..5c32e416ca 100644 --- a/gr-blocks/lib/tag_debug_impl.cc +++ b/gr-blocks/lib/tag_debug_impl.cc @@ -24,8 +24,8 @@ tag_debug::sptr tag_debug::make(size_t sizeof_stream_item, const std::string& name, const std::string& key_filter) { - return gnuradio::get_initial_sptr( - new tag_debug_impl(sizeof_stream_item, name, key_filter)); + return gnuradio::make_block_sptr<tag_debug_impl>( + sizeof_stream_item, name, key_filter); } tag_debug_impl::tag_debug_impl(size_t sizeof_stream_item, diff --git a/gr-blocks/lib/tag_gate_impl.cc b/gr-blocks/lib/tag_gate_impl.cc index de97674350..41d6d005ac 100644 --- a/gr-blocks/lib/tag_gate_impl.cc +++ b/gr-blocks/lib/tag_gate_impl.cc @@ -20,7 +20,7 @@ namespace blocks { tag_gate::sptr tag_gate::make(size_t item_size, bool propagate_tags) { - return gnuradio::get_initial_sptr(new tag_gate_impl(item_size, propagate_tags)); + return gnuradio::make_block_sptr<tag_gate_impl>(item_size, propagate_tags); } tag_gate_impl::tag_gate_impl(size_t item_size, bool propagate_tags) diff --git a/gr-blocks/lib/tag_share_impl.cc b/gr-blocks/lib/tag_share_impl.cc index 27aa481c1d..3e17ec9c3a 100644 --- a/gr-blocks/lib/tag_share_impl.cc +++ b/gr-blocks/lib/tag_share_impl.cc @@ -21,8 +21,8 @@ namespace blocks { tag_share::sptr tag_share::make(size_t sizeof_io_item, size_t sizeof_share_item, size_t vlen) { - return gnuradio::get_initial_sptr( - new tag_share_impl(sizeof_io_item, sizeof_share_item, vlen)); + return gnuradio::make_block_sptr<tag_share_impl>( + sizeof_io_item, sizeof_share_item, vlen); } /* diff --git a/gr-blocks/lib/tagged_file_sink_impl.cc b/gr-blocks/lib/tagged_file_sink_impl.cc index 7003293a08..ae535aac54 100644 --- a/gr-blocks/lib/tagged_file_sink_impl.cc +++ b/gr-blocks/lib/tagged_file_sink_impl.cc @@ -43,7 +43,7 @@ namespace blocks { tagged_file_sink::sptr tagged_file_sink::make(size_t itemsize, double samp_rate) { - return gnuradio::get_initial_sptr(new tagged_file_sink_impl(itemsize, samp_rate)); + return gnuradio::make_block_sptr<tagged_file_sink_impl>(itemsize, samp_rate); } tagged_file_sink_impl::tagged_file_sink_impl(size_t itemsize, double samp_rate) diff --git a/gr-blocks/lib/tagged_stream_align_impl.cc b/gr-blocks/lib/tagged_stream_align_impl.cc index 824a27df35..9e3cd2c01a 100644 --- a/gr-blocks/lib/tagged_stream_align_impl.cc +++ b/gr-blocks/lib/tagged_stream_align_impl.cc @@ -21,8 +21,7 @@ namespace blocks { tagged_stream_align::sptr tagged_stream_align::make(size_t itemsize, const std::string& lengthtagname) { - return gnuradio::get_initial_sptr( - new tagged_stream_align_impl(itemsize, lengthtagname)); + return gnuradio::make_block_sptr<tagged_stream_align_impl>(itemsize, lengthtagname); } tagged_stream_align_impl::tagged_stream_align_impl(size_t itemsize, diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc index 948c189444..20d7bf1961 100644 --- a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc +++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc @@ -21,8 +21,8 @@ namespace blocks { tagged_stream_multiply_length::sptr tagged_stream_multiply_length::make( size_t itemsize, const std::string& lengthtagname, double scalar) { - return gnuradio::get_initial_sptr( - new tagged_stream_multiply_length_impl(itemsize, lengthtagname, scalar)); + return gnuradio::make_block_sptr<tagged_stream_multiply_length_impl>( + itemsize, lengthtagname, scalar); } tagged_stream_multiply_length_impl::tagged_stream_multiply_length_impl( diff --git a/gr-blocks/lib/tagged_stream_mux_impl.cc b/gr-blocks/lib/tagged_stream_mux_impl.cc index dd83fa41db..9e5745340b 100644 --- a/gr-blocks/lib/tagged_stream_mux_impl.cc +++ b/gr-blocks/lib/tagged_stream_mux_impl.cc @@ -22,8 +22,8 @@ tagged_stream_mux::sptr tagged_stream_mux::make(size_t itemsize, const std::string& lengthtagname, unsigned int tag_preserve_head_pos) { - return gnuradio::get_initial_sptr( - new tagged_stream_mux_impl(itemsize, lengthtagname, tag_preserve_head_pos)); + return gnuradio::make_block_sptr<tagged_stream_mux_impl>( + itemsize, lengthtagname, tag_preserve_head_pos); } tagged_stream_mux_impl::tagged_stream_mux_impl(size_t itemsize, diff --git a/gr-blocks/lib/tagged_stream_to_pdu_impl.cc b/gr-blocks/lib/tagged_stream_to_pdu_impl.cc index aef246ad53..2ca5e8e68f 100644 --- a/gr-blocks/lib/tagged_stream_to_pdu_impl.cc +++ b/gr-blocks/lib/tagged_stream_to_pdu_impl.cc @@ -22,7 +22,7 @@ namespace blocks { tagged_stream_to_pdu::sptr tagged_stream_to_pdu::make(pdu::vector_type type, const std::string& lengthtagname) { - return gnuradio::get_initial_sptr(new tagged_stream_to_pdu_impl(type, lengthtagname)); + return gnuradio::make_block_sptr<tagged_stream_to_pdu_impl>(type, lengthtagname); } tagged_stream_to_pdu_impl::tagged_stream_to_pdu_impl(pdu::vector_type type, diff --git a/gr-blocks/lib/tags_strobe_impl.cc b/gr-blocks/lib/tags_strobe_impl.cc index 9280816170..31efbe14bc 100644 --- a/gr-blocks/lib/tags_strobe_impl.cc +++ b/gr-blocks/lib/tags_strobe_impl.cc @@ -31,8 +31,8 @@ tags_strobe::sptr tags_strobe::make(size_t sizeof_stream_item, uint64_t nsamps, pmt::pmt_t key) { - return gnuradio::get_initial_sptr( - new tags_strobe_impl(sizeof_stream_item, value, nsamps, key)); + return gnuradio::make_block_sptr<tags_strobe_impl>( + sizeof_stream_item, value, nsamps, key); } tags_strobe_impl::tags_strobe_impl(size_t sizeof_stream_item, diff --git a/gr-blocks/lib/tcp_server_sink_impl.cc b/gr-blocks/lib/tcp_server_sink_impl.cc index b0e366eb0f..d306dffac6 100644 --- a/gr-blocks/lib/tcp_server_sink_impl.cc +++ b/gr-blocks/lib/tcp_server_sink_impl.cc @@ -29,8 +29,7 @@ namespace blocks { tcp_server_sink::sptr tcp_server_sink::make(size_t itemsize, const std::string& host, int port, bool noblock) { - return gnuradio::get_initial_sptr( - new tcp_server_sink_impl(itemsize, host, port, noblock)); + return gnuradio::make_block_sptr<tcp_server_sink_impl>(itemsize, host, port, noblock); } tcp_server_sink_impl::tcp_server_sink_impl(size_t itemsize, diff --git a/gr-blocks/lib/test_tag_variable_rate_ff_impl.cc b/gr-blocks/lib/test_tag_variable_rate_ff_impl.cc index 19a005d2f5..f6cfd7a7b4 100644 --- a/gr-blocks/lib/test_tag_variable_rate_ff_impl.cc +++ b/gr-blocks/lib/test_tag_variable_rate_ff_impl.cc @@ -29,8 +29,8 @@ namespace blocks { test_tag_variable_rate_ff::sptr test_tag_variable_rate_ff::make(bool update_once, double update_step) { - return gnuradio::get_initial_sptr( - new test_tag_variable_rate_ff_impl(update_once, update_step)); + return gnuradio::make_block_sptr<test_tag_variable_rate_ff_impl>(update_once, + update_step); } test_tag_variable_rate_ff_impl::test_tag_variable_rate_ff_impl(bool update_once, diff --git a/gr-blocks/lib/threshold_ff_impl.cc b/gr-blocks/lib/threshold_ff_impl.cc index 86405710ef..c0ea05b1b9 100644 --- a/gr-blocks/lib/threshold_ff_impl.cc +++ b/gr-blocks/lib/threshold_ff_impl.cc @@ -20,7 +20,7 @@ namespace blocks { threshold_ff::sptr threshold_ff::make(float lo, float hi, float initial_state) { - return gnuradio::get_initial_sptr(new threshold_ff_impl(lo, hi, initial_state)); + return gnuradio::make_block_sptr<threshold_ff_impl>(lo, hi, initial_state); } threshold_ff_impl::threshold_ff_impl(float lo, float hi, float initial_state) diff --git a/gr-blocks/lib/throttle_impl.cc b/gr-blocks/lib/throttle_impl.cc index 9854af151b..199ddea588 100644 --- a/gr-blocks/lib/throttle_impl.cc +++ b/gr-blocks/lib/throttle_impl.cc @@ -25,8 +25,8 @@ namespace blocks { throttle::sptr throttle::make(size_t itemsize, double samples_per_sec, bool ignore_tags) { - return gnuradio::get_initial_sptr( - new throttle_impl(itemsize, samples_per_sec, ignore_tags)); + return gnuradio::make_block_sptr<throttle_impl>( + itemsize, samples_per_sec, ignore_tags); } throttle_impl::throttle_impl(size_t itemsize, double samples_per_second, bool ignore_tags) diff --git a/gr-blocks/lib/transcendental_impl.cc b/gr-blocks/lib/transcendental_impl.cc index 5498c2f750..0f39cc460d 100644 --- a/gr-blocks/lib/transcendental_impl.cc +++ b/gr-blocks/lib/transcendental_impl.cc @@ -104,8 +104,8 @@ transcendental::sptr transcendental::make(const std::string& name, throw std::runtime_error("could not find transcendental function for " + key); // make a new block with found work function - return gnuradio::get_initial_sptr( - new transcendental_impl(get_map()[key].work_fcn, get_map()[key].io_size)); + return gnuradio::make_block_sptr<transcendental_impl>(get_map()[key].work_fcn, + get_map()[key].io_size); } transcendental_impl::transcendental_impl(const work_fcn_type& work_fcn, diff --git a/gr-blocks/lib/tsb_vector_sink_impl.cc b/gr-blocks/lib/tsb_vector_sink_impl.cc index 9e40dc272f..24fd5f462b 100644 --- a/gr-blocks/lib/tsb_vector_sink_impl.cc +++ b/gr-blocks/lib/tsb_vector_sink_impl.cc @@ -23,7 +23,7 @@ template <class T> typename tsb_vector_sink<T>::sptr tsb_vector_sink<T>::make(unsigned int vlen, const std::string& tsb_key) { - return gnuradio::get_initial_sptr(new tsb_vector_sink_impl<T>(vlen, tsb_key)); + return gnuradio::make_block_sptr<tsb_vector_sink_impl<T>>(vlen, tsb_key); } template <class T> diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc index c2e352c559..7d85e12db8 100644 --- a/gr-blocks/lib/tuntap_pdu_impl.cc +++ b/gr-blocks/lib/tuntap_pdu_impl.cc @@ -33,7 +33,7 @@ namespace blocks { tuntap_pdu::sptr tuntap_pdu::make(std::string dev, int MTU, bool istunflag) { #if (defined(linux) || defined(__linux) || defined(__linux__)) - return gnuradio::get_initial_sptr(new tuntap_pdu_impl(dev, MTU, istunflag)); + return gnuradio::make_block_sptr<tuntap_pdu_impl>(dev, MTU, istunflag); #else throw std::runtime_error("tuntap_pdu not implemented on this platform"); #endif diff --git a/gr-blocks/lib/uchar_to_float_impl.cc b/gr-blocks/lib/uchar_to_float_impl.cc index 5e9c44bd4d..85b62389cf 100644 --- a/gr-blocks/lib/uchar_to_float_impl.cc +++ b/gr-blocks/lib/uchar_to_float_impl.cc @@ -21,7 +21,7 @@ namespace blocks { uchar_to_float::sptr uchar_to_float::make() { - return gnuradio::get_initial_sptr(new uchar_to_float_impl()); + return gnuradio::make_block_sptr<uchar_to_float_impl>(); } uchar_to_float_impl::uchar_to_float_impl() diff --git a/gr-blocks/lib/udp_sink_impl.cc b/gr-blocks/lib/udp_sink_impl.cc index 2ea8bf1fda..3eff348eeb 100644 --- a/gr-blocks/lib/udp_sink_impl.cc +++ b/gr-blocks/lib/udp_sink_impl.cc @@ -29,8 +29,8 @@ namespace blocks { udp_sink::sptr udp_sink::make( size_t itemsize, const std::string& host, int port, int payload_size, bool eof) { - return gnuradio::get_initial_sptr( - new udp_sink_impl(itemsize, host, port, payload_size, eof)); + return gnuradio::make_block_sptr<udp_sink_impl>( + itemsize, host, port, payload_size, eof); } udp_sink_impl::udp_sink_impl( diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc index ed91a21d0c..e13fc60e3f 100644 --- a/gr-blocks/lib/udp_source_impl.cc +++ b/gr-blocks/lib/udp_source_impl.cc @@ -31,8 +31,8 @@ const int udp_source_impl::BUF_SIZE_PAYLOADS = udp_source::sptr udp_source::make( size_t itemsize, const std::string& ipaddr, int port, int payload_size, bool eof) { - return gnuradio::get_initial_sptr( - new udp_source_impl(itemsize, ipaddr, port, payload_size, eof)); + return gnuradio::make_block_sptr<udp_source_impl>( + itemsize, ipaddr, port, payload_size, eof); } udp_source_impl::udp_source_impl( diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.cc b/gr-blocks/lib/unpack_k_bits_bb_impl.cc index 6b9a588b78..680abca4f4 100644 --- a/gr-blocks/lib/unpack_k_bits_bb_impl.cc +++ b/gr-blocks/lib/unpack_k_bits_bb_impl.cc @@ -22,7 +22,7 @@ namespace blocks { unpack_k_bits_bb::sptr unpack_k_bits_bb::make(unsigned k) { - return gnuradio::get_initial_sptr(new unpack_k_bits_bb_impl(k)); + return gnuradio::make_block_sptr<unpack_k_bits_bb_impl>(k); } unpack_k_bits_bb_impl::unpack_k_bits_bb_impl(unsigned k) diff --git a/gr-blocks/lib/unpacked_to_packed_impl.cc b/gr-blocks/lib/unpacked_to_packed_impl.cc index e14e07da76..af94a50923 100644 --- a/gr-blocks/lib/unpacked_to_packed_impl.cc +++ b/gr-blocks/lib/unpacked_to_packed_impl.cc @@ -25,8 +25,8 @@ template <class T> typename unpacked_to_packed<T>::sptr unpacked_to_packed<T>::make(unsigned int bits_per_chunk, endianness_t endianness) { - return gnuradio::get_initial_sptr( - new unpacked_to_packed_impl<T>(bits_per_chunk, endianness)); + return gnuradio::make_block_sptr<unpacked_to_packed_impl<T>>(bits_per_chunk, + endianness); } template <class T> diff --git a/gr-blocks/lib/vco_c_impl.cc b/gr-blocks/lib/vco_c_impl.cc index 20ea961484..5d78d9b00f 100644 --- a/gr-blocks/lib/vco_c_impl.cc +++ b/gr-blocks/lib/vco_c_impl.cc @@ -21,8 +21,7 @@ namespace blocks { vco_c::sptr vco_c::make(double sampling_rate, double sensitivity, double amplitude) { - return gnuradio::get_initial_sptr( - new vco_c_impl(sampling_rate, sensitivity, amplitude)); + return gnuradio::make_block_sptr<vco_c_impl>(sampling_rate, sensitivity, amplitude); } vco_c_impl::vco_c_impl(double sampling_rate, double sensitivity, double amplitude) diff --git a/gr-blocks/lib/vco_f_impl.cc b/gr-blocks/lib/vco_f_impl.cc index 68cd12ee36..a88de6545e 100644 --- a/gr-blocks/lib/vco_f_impl.cc +++ b/gr-blocks/lib/vco_f_impl.cc @@ -21,8 +21,7 @@ namespace blocks { vco_f::sptr vco_f::make(double sampling_rate, double sensitivity, double amplitude) { - return gnuradio::get_initial_sptr( - new vco_f_impl(sampling_rate, sensitivity, amplitude)); + return gnuradio::make_block_sptr<vco_f_impl>(sampling_rate, sensitivity, amplitude); } vco_f_impl::vco_f_impl(double sampling_rate, double sensitivity, double amplitude) diff --git a/gr-blocks/lib/vector_insert_impl.cc b/gr-blocks/lib/vector_insert_impl.cc index 57b0802b57..96e5733528 100644 --- a/gr-blocks/lib/vector_insert_impl.cc +++ b/gr-blocks/lib/vector_insert_impl.cc @@ -27,8 +27,7 @@ template <class T> typename vector_insert<T>::sptr vector_insert<T>::make(const std::vector<T>& data, int periodicity, int offset) { - return gnuradio::get_initial_sptr( - new vector_insert_impl<T>(data, periodicity, offset)); + return gnuradio::make_block_sptr<vector_insert_impl<T>>(data, periodicity, offset); } template <class T> diff --git a/gr-blocks/lib/vector_map_impl.cc b/gr-blocks/lib/vector_map_impl.cc index 40b30a5bc8..d57a2f6e41 100644 --- a/gr-blocks/lib/vector_map_impl.cc +++ b/gr-blocks/lib/vector_map_impl.cc @@ -42,7 +42,7 @@ vector_map::sptr vector_map::make(size_t item_size, std::vector<size_t> in_vlens, std::vector<std::vector<std::vector<size_t>>> mapping) { - return gnuradio::get_initial_sptr(new vector_map_impl(item_size, in_vlens, mapping)); + return gnuradio::make_block_sptr<vector_map_impl>(item_size, in_vlens, mapping); } vector_map_impl::vector_map_impl(size_t item_size, diff --git a/gr-blocks/lib/vector_sink_impl.cc b/gr-blocks/lib/vector_sink_impl.cc index c634a6427a..eafe7a47c7 100644 --- a/gr-blocks/lib/vector_sink_impl.cc +++ b/gr-blocks/lib/vector_sink_impl.cc @@ -26,7 +26,7 @@ template <class T> typename vector_sink<T>::sptr vector_sink<T>::make(unsigned int vlen, const int reserve_items) { - return gnuradio::get_initial_sptr(new vector_sink_impl<T>(vlen, reserve_items)); + return gnuradio::make_block_sptr<vector_sink_impl<T>>(vlen, reserve_items); } template <class T> diff --git a/gr-blocks/lib/vector_source_impl.cc b/gr-blocks/lib/vector_source_impl.cc index e2f338d06d..58bfa96f8e 100644 --- a/gr-blocks/lib/vector_source_impl.cc +++ b/gr-blocks/lib/vector_source_impl.cc @@ -27,8 +27,7 @@ typename vector_source<T>::sptr vector_source<T>::make(const std::vector<T>& dat unsigned int vlen, const std::vector<tag_t>& tags) { - return gnuradio::get_initial_sptr( - new vector_source_impl<T>(data, repeat, vlen, tags)); + return gnuradio::make_block_sptr<vector_source_impl<T>>(data, repeat, vlen, tags); } template <class T> diff --git a/gr-blocks/lib/vector_to_stream_impl.cc b/gr-blocks/lib/vector_to_stream_impl.cc index aa7677d189..699039646d 100644 --- a/gr-blocks/lib/vector_to_stream_impl.cc +++ b/gr-blocks/lib/vector_to_stream_impl.cc @@ -20,8 +20,7 @@ namespace blocks { vector_to_stream::sptr vector_to_stream::make(size_t itemsize, size_t nitems_per_block) { - return gnuradio::get_initial_sptr( - new vector_to_stream_impl(itemsize, nitems_per_block)); + return gnuradio::make_block_sptr<vector_to_stream_impl>(itemsize, nitems_per_block); } vector_to_stream_impl::vector_to_stream_impl(size_t itemsize, size_t nitems_per_block) diff --git a/gr-blocks/lib/vector_to_streams_impl.cc b/gr-blocks/lib/vector_to_streams_impl.cc index b694d3a6e5..8a1be7448a 100644 --- a/gr-blocks/lib/vector_to_streams_impl.cc +++ b/gr-blocks/lib/vector_to_streams_impl.cc @@ -20,7 +20,7 @@ namespace blocks { vector_to_streams::sptr vector_to_streams::make(size_t itemsize, size_t nstreams) { - return gnuradio::get_initial_sptr(new vector_to_streams_impl(itemsize, nstreams)); + return gnuradio::make_block_sptr<vector_to_streams_impl>(itemsize, nstreams); } vector_to_streams_impl::vector_to_streams_impl(size_t itemsize, size_t nstreams) diff --git a/gr-blocks/lib/wavfile_sink_impl.cc b/gr-blocks/lib/wavfile_sink_impl.cc index 286d065ddc..bcd33a52cb 100644 --- a/gr-blocks/lib/wavfile_sink_impl.cc +++ b/gr-blocks/lib/wavfile_sink_impl.cc @@ -49,8 +49,8 @@ wavfile_sink::sptr wavfile_sink::make(const char* filename, int bits_per_sample, bool append) { - return gnuradio::get_initial_sptr(new wavfile_sink_impl( - filename, n_channels, sample_rate, bits_per_sample, append)); + return gnuradio::make_block_sptr<wavfile_sink_impl>( + filename, n_channels, sample_rate, bits_per_sample, append); } wavfile_sink_impl::wavfile_sink_impl(const char* filename, diff --git a/gr-blocks/lib/wavfile_source_impl.cc b/gr-blocks/lib/wavfile_source_impl.cc index 18ae74eb4b..b6bb559a5d 100644 --- a/gr-blocks/lib/wavfile_source_impl.cc +++ b/gr-blocks/lib/wavfile_source_impl.cc @@ -40,7 +40,7 @@ namespace blocks { wavfile_source::sptr wavfile_source::make(const char* filename, bool repeat) { - return gnuradio::get_initial_sptr(new wavfile_source_impl(filename, repeat)); + return gnuradio::make_block_sptr<wavfile_source_impl>(filename, repeat); } wavfile_source_impl::wavfile_source_impl(const char* filename, bool repeat) diff --git a/gr-blocks/lib/xor_blk_impl.cc b/gr-blocks/lib/xor_blk_impl.cc index ddc8851049..f8f401555c 100644 --- a/gr-blocks/lib/xor_blk_impl.cc +++ b/gr-blocks/lib/xor_blk_impl.cc @@ -21,7 +21,7 @@ namespace blocks { template <class T> typename xor_blk<T>::sptr xor_blk<T>::make(size_t vlen) { - return gnuradio::get_initial_sptr(new xor_blk_impl<T>(vlen)); + return gnuradio::make_block_sptr<xor_blk_impl<T>>(vlen); } template <class T> |