diff options
434 files changed, 829 insertions, 898 deletions
diff --git a/gnuradio-runtime/include/gnuradio/hier_block2.h b/gnuradio-runtime/include/gnuradio/hier_block2.h index 69173becd6..fc81796a78 100644 --- a/gnuradio-runtime/include/gnuradio/hier_block2.h +++ b/gnuradio-runtime/include/gnuradio/hier_block2.h @@ -34,10 +34,8 @@ class GR_RUNTIME_API hier_block2 : public basic_block { private: friend class hier_block2_detail; - friend GR_RUNTIME_API hier_block2_sptr - make_hier_block2(const std::string& name, - gr::io_signature::sptr input_signature, - gr::io_signature::sptr output_signature); + template <typename T, typename... Args> + friend std::shared_ptr<T> gnuradio::make_block_sptr(Args&&... args); /*! * \brief Private implementation details of gr::hier_block2. diff --git a/gnuradio-runtime/include/gnuradio/top_block.h b/gnuradio-runtime/include/gnuradio/top_block.h index fd8ab66a94..12051e6f04 100644 --- a/gnuradio-runtime/include/gnuradio/top_block.h +++ b/gnuradio-runtime/include/gnuradio/top_block.h @@ -28,8 +28,9 @@ GR_RUNTIME_API top_block_sptr make_top_block(const std::string& name, class GR_RUNTIME_API top_block : public hier_block2 { private: - friend GR_RUNTIME_API top_block_sptr make_top_block(const std::string& name, - bool catch_exceptions); + template <typename T, typename... Args> + friend std::shared_ptr<T> gnuradio::make_block_sptr(Args&&... args); + std::unique_ptr<top_block_impl> d_impl; diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc index 035152051c..18b60b9a47 100644 --- a/gnuradio-runtime/lib/hier_block2.cc +++ b/gnuradio-runtime/lib/hier_block2.cc @@ -27,8 +27,8 @@ hier_block2_sptr make_hier_block2(const std::string& name, gr::io_signature::sptr input_signature, gr::io_signature::sptr output_signature) { - return gnuradio::get_initial_sptr( - new hier_block2(name, input_signature, output_signature)); + return gnuradio::make_block_sptr<hier_block2>( + name, input_signature, output_signature); } hier_block2::hier_block2() {} diff --git a/gnuradio-runtime/lib/test.cc b/gnuradio-runtime/lib/test.cc index 9f2e3c58e0..810489e928 100644 --- a/gnuradio-runtime/lib/test.cc +++ b/gnuradio-runtime/lib/test.cc @@ -34,19 +34,19 @@ test_sptr make_test(const std::string& name, consume_type_t cons_type, produce_type_t prod_type) { - return gnuradio::get_initial_sptr(new test(name, - min_inputs, - max_inputs, - sizeof_input_item, - min_outputs, - max_outputs, - sizeof_output_item, - history, - output_multiple, - relative_rate, - fixed_rate, - cons_type, - prod_type)); + return gnuradio::make_block_sptr<test>(name, + min_inputs, + max_inputs, + sizeof_input_item, + min_outputs, + max_outputs, + sizeof_output_item, + history, + output_multiple, + relative_rate, + fixed_rate, + cons_type, + prod_type); } test::test(const std::string& name, diff --git a/gnuradio-runtime/lib/test.h b/gnuradio-runtime/lib/test.h index ab03231861..2b8dc78252 100644 --- a/gnuradio-runtime/lib/test.h +++ b/gnuradio-runtime/lib/test.h @@ -205,19 +205,8 @@ protected: consume_type_t cons_type, produce_type_t prod_type); - friend GR_RUNTIME_API test_sptr make_test(const std::string& name, - int min_inputs, - int max_inputs, - unsigned int sizeof_input_item, - int min_outputs, - int max_outputs, - unsigned int sizeof_output_item, - unsigned int history, - unsigned int output_multiple, - double relative_rate, - bool fixed_rate, - consume_type_t cons_type, - produce_type_t prod_type); + template <typename T, typename... Args> + friend std::shared_ptr<T> gnuradio::make_block_sptr(Args&&... args); }; } /* namespace gr */ diff --git a/gnuradio-runtime/lib/top_block.cc b/gnuradio-runtime/lib/top_block.cc index aad25f005a..c7e0ee74ce 100644 --- a/gnuradio-runtime/lib/top_block.cc +++ b/gnuradio-runtime/lib/top_block.cc @@ -24,7 +24,7 @@ namespace gr { top_block_sptr make_top_block(const std::string& name, bool catch_exceptions) { - return gnuradio::get_initial_sptr(new top_block(name, catch_exceptions)); + return gnuradio::make_block_sptr<top_block>(name, catch_exceptions); } top_block::top_block(const std::string& name, bool catch_exceptions) diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/hier_block2_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/hier_block2_python.cc index f2d439ad52..8e3531bd2e 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/hier_block2_python.cc +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/hier_block2_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(hier_block2.h) */ -/* BINDTOOL_HEADER_FILE_HASH(367d4df8d747ae4040c2e5b46cbe1b4f) */ +/* BINDTOOL_HEADER_FILE_HASH(64f7da5ad13cee375a2646d78073229b) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/sptr_magic_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/sptr_magic_python.cc index 91706dd079..1f7d5a43ce 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/sptr_magic_python.cc +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/sptr_magic_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(sptr_magic.h) */ -/* BINDTOOL_HEADER_FILE_HASH(53ec33a057706160ccd13788ef91ab9b) */ +/* BINDTOOL_HEADER_FILE_HASH(79deab244963f18ba5e14b48a482f967) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/top_block_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/top_block_python.cc index 16a9c817a8..caed388ad5 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/top_block_python.cc +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/top_block_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(top_block.h) */ -/* BINDTOOL_HEADER_FILE_HASH(c3f0d1bdb473739fbd3e929fc8338e94) */ +/* BINDTOOL_HEADER_FILE_HASH(96ae1e4a3aed7d59ef7e8c596e83c07e) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-analog/lib/agc2_cc_impl.cc b/gr-analog/lib/agc2_cc_impl.cc index 6304b56066..25144c0609 100644 --- a/gr-analog/lib/agc2_cc_impl.cc +++ b/gr-analog/lib/agc2_cc_impl.cc @@ -22,8 +22,8 @@ namespace analog { agc2_cc::sptr agc2_cc::make(float attack_rate, float decay_rate, float reference, float gain) { - return gnuradio::get_initial_sptr( - new agc2_cc_impl(attack_rate, decay_rate, reference, gain)); + return gnuradio::make_block_sptr<agc2_cc_impl>( + attack_rate, decay_rate, reference, gain); } agc2_cc_impl::agc2_cc_impl(float attack_rate, diff --git a/gr-analog/lib/agc2_ff_impl.cc b/gr-analog/lib/agc2_ff_impl.cc index 8c9f6c9262..9af7afcdc9 100644 --- a/gr-analog/lib/agc2_ff_impl.cc +++ b/gr-analog/lib/agc2_ff_impl.cc @@ -21,8 +21,8 @@ namespace analog { agc2_ff::sptr agc2_ff::make(float attack_rate, float decay_rate, float reference, float gain) { - return gnuradio::get_initial_sptr( - new agc2_ff_impl(attack_rate, decay_rate, reference, gain)); + return gnuradio::make_block_sptr<agc2_ff_impl>( + attack_rate, decay_rate, reference, gain); } agc2_ff_impl::~agc2_ff_impl() {} diff --git a/gr-analog/lib/agc3_cc_impl.cc b/gr-analog/lib/agc3_cc_impl.cc index 2f80c10201..489029b667 100644 --- a/gr-analog/lib/agc3_cc_impl.cc +++ b/gr-analog/lib/agc3_cc_impl.cc @@ -28,8 +28,8 @@ agc3_cc::sptr agc3_cc::make(float attack_rate, float gain, int iir_update_decim) { - return gnuradio::get_initial_sptr( - new agc3_cc_impl(attack_rate, decay_rate, reference, gain, iir_update_decim)); + return gnuradio::make_block_sptr<agc3_cc_impl>( + attack_rate, decay_rate, reference, gain, iir_update_decim); } agc3_cc_impl::agc3_cc_impl(float attack_rate, diff --git a/gr-analog/lib/agc_cc_impl.cc b/gr-analog/lib/agc_cc_impl.cc index 59ce1f21c7..d0f6ff9e19 100644 --- a/gr-analog/lib/agc_cc_impl.cc +++ b/gr-analog/lib/agc_cc_impl.cc @@ -21,7 +21,7 @@ namespace analog { agc_cc::sptr agc_cc::make(float rate, float reference, float gain) { - return gnuradio::get_initial_sptr(new agc_cc_impl(rate, reference, gain)); + return gnuradio::make_block_sptr<agc_cc_impl>(rate, reference, gain); } agc_cc_impl::agc_cc_impl(float rate, float reference, float gain) diff --git a/gr-analog/lib/agc_ff_impl.cc b/gr-analog/lib/agc_ff_impl.cc index d63ed7d2e4..16b435538e 100644 --- a/gr-analog/lib/agc_ff_impl.cc +++ b/gr-analog/lib/agc_ff_impl.cc @@ -20,7 +20,7 @@ namespace analog { agc_ff::sptr agc_ff::make(float rate, float reference, float gain) { - return gnuradio::get_initial_sptr(new agc_ff_impl(rate, reference, gain)); + return gnuradio::make_block_sptr<agc_ff_impl>(rate, reference, gain); } agc_ff_impl::agc_ff_impl(float rate, float reference, float gain) diff --git a/gr-analog/lib/cpfsk_bc_impl.cc b/gr-analog/lib/cpfsk_bc_impl.cc index 5827d3f1cf..80112b1544 100644 --- a/gr-analog/lib/cpfsk_bc_impl.cc +++ b/gr-analog/lib/cpfsk_bc_impl.cc @@ -20,7 +20,7 @@ namespace analog { cpfsk_bc::sptr cpfsk_bc::make(float k, float ampl, int samples_per_sym) { - return gnuradio::get_initial_sptr(new cpfsk_bc_impl(k, ampl, samples_per_sym)); + return gnuradio::make_block_sptr<cpfsk_bc_impl>(k, ampl, samples_per_sym); } cpfsk_bc_impl::cpfsk_bc_impl(float k, float ampl, int samples_per_sym) diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.cc b/gr-analog/lib/ctcss_squelch_ff_impl.cc index 692f920578..56da0224a6 100644 --- a/gr-analog/lib/ctcss_squelch_ff_impl.cc +++ b/gr-analog/lib/ctcss_squelch_ff_impl.cc @@ -29,8 +29,8 @@ static int max_tone_index = 37; ctcss_squelch_ff::sptr ctcss_squelch_ff::make(int rate, float freq, float level, int len, int ramp, bool gate) { - return gnuradio::get_initial_sptr( - new ctcss_squelch_ff_impl(rate, freq, level, len, ramp, gate)); + return gnuradio::make_block_sptr<ctcss_squelch_ff_impl>( + rate, freq, level, len, ramp, gate); } int ctcss_squelch_ff_impl::find_tone(float freq) diff --git a/gr-analog/lib/dpll_bb_impl.cc b/gr-analog/lib/dpll_bb_impl.cc index 18bc054bc5..a7d4ac8917 100644 --- a/gr-analog/lib/dpll_bb_impl.cc +++ b/gr-analog/lib/dpll_bb_impl.cc @@ -20,7 +20,7 @@ namespace analog { dpll_bb::sptr dpll_bb::make(float period, float gain) { - return gnuradio::get_initial_sptr(new dpll_bb_impl(period, gain)); + return gnuradio::make_block_sptr<dpll_bb_impl>(period, gain); } dpll_bb_impl::dpll_bb_impl(float period, float gain) diff --git a/gr-analog/lib/fastnoise_source_impl.cc b/gr-analog/lib/fastnoise_source_impl.cc index a8d6d91650..f0f9200cee 100644 --- a/gr-analog/lib/fastnoise_source_impl.cc +++ b/gr-analog/lib/fastnoise_source_impl.cc @@ -26,8 +26,7 @@ template <class T> typename fastnoise_source<T>::sptr fastnoise_source<T>::make(noise_type_t type, float ampl, long seed, long samples) { - return gnuradio::get_initial_sptr( - new fastnoise_source_impl<T>(type, ampl, seed, samples)); + return gnuradio::make_block_sptr<fastnoise_source_impl<T>>(type, ampl, seed, samples); } template <> diff --git a/gr-analog/lib/feedforward_agc_cc_impl.cc b/gr-analog/lib/feedforward_agc_cc_impl.cc index ec94f9d249..afccc75f56 100644 --- a/gr-analog/lib/feedforward_agc_cc_impl.cc +++ b/gr-analog/lib/feedforward_agc_cc_impl.cc @@ -21,7 +21,7 @@ namespace analog { feedforward_agc_cc::sptr feedforward_agc_cc::make(int nsamples, float reference) { - return gnuradio::get_initial_sptr(new feedforward_agc_cc_impl(nsamples, reference)); + return gnuradio::make_block_sptr<feedforward_agc_cc_impl>(nsamples, reference); } feedforward_agc_cc_impl::feedforward_agc_cc_impl(int nsamples, float reference) diff --git a/gr-analog/lib/fmdet_cf_impl.cc b/gr-analog/lib/fmdet_cf_impl.cc index 02164c5ad8..5a4fddeaa5 100644 --- a/gr-analog/lib/fmdet_cf_impl.cc +++ b/gr-analog/lib/fmdet_cf_impl.cc @@ -22,8 +22,7 @@ namespace analog { fmdet_cf::sptr fmdet_cf::make(float samplerate, float freq_low, float freq_high, float scl) { - return gnuradio::get_initial_sptr( - new fmdet_cf_impl(samplerate, freq_low, freq_high, scl)); + return gnuradio::make_block_sptr<fmdet_cf_impl>(samplerate, freq_low, freq_high, scl); } fmdet_cf_impl::fmdet_cf_impl(float samplerate, float freq_low, float freq_high, float scl) diff --git a/gr-analog/lib/frequency_modulator_fc_impl.cc b/gr-analog/lib/frequency_modulator_fc_impl.cc index 02c95f609f..0e37357015 100644 --- a/gr-analog/lib/frequency_modulator_fc_impl.cc +++ b/gr-analog/lib/frequency_modulator_fc_impl.cc @@ -23,7 +23,7 @@ namespace analog { frequency_modulator_fc::sptr frequency_modulator_fc::make(float sensitivity) { - return gnuradio::get_initial_sptr(new frequency_modulator_fc_impl(sensitivity)); + return gnuradio::make_block_sptr<frequency_modulator_fc_impl>(sensitivity); } frequency_modulator_fc_impl::frequency_modulator_fc_impl(float sensitivity) diff --git a/gr-analog/lib/noise_source_impl.cc b/gr-analog/lib/noise_source_impl.cc index fb5b3347d4..f33eca8294 100644 --- a/gr-analog/lib/noise_source_impl.cc +++ b/gr-analog/lib/noise_source_impl.cc @@ -24,7 +24,7 @@ template <class T> typename noise_source<T>::sptr noise_source<T>::make(noise_type_t type, float ampl, long seed) { - return gnuradio::get_initial_sptr(new noise_source_impl<T>(type, ampl, seed)); + return gnuradio::make_block_sptr<noise_source_impl<T>>(type, ampl, seed); } template <class T> diff --git a/gr-analog/lib/phase_modulator_fc_impl.cc b/gr-analog/lib/phase_modulator_fc_impl.cc index 33dc11c795..eb67d0a608 100644 --- a/gr-analog/lib/phase_modulator_fc_impl.cc +++ b/gr-analog/lib/phase_modulator_fc_impl.cc @@ -22,7 +22,7 @@ namespace analog { phase_modulator_fc::sptr phase_modulator_fc::make(double sensitivity) { - return gnuradio::get_initial_sptr(new phase_modulator_fc_impl(sensitivity)); + return gnuradio::make_block_sptr<phase_modulator_fc_impl>(sensitivity); } phase_modulator_fc_impl::phase_modulator_fc_impl(double sensitivity) diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.cc b/gr-analog/lib/pll_carriertracking_cc_impl.cc index f403cf3528..f52079f3ad 100644 --- a/gr-analog/lib/pll_carriertracking_cc_impl.cc +++ b/gr-analog/lib/pll_carriertracking_cc_impl.cc @@ -24,8 +24,8 @@ namespace analog { pll_carriertracking_cc::sptr pll_carriertracking_cc::make(float loop_bw, float max_freq, float min_freq) { - return gnuradio::get_initial_sptr( - new pll_carriertracking_cc_impl(loop_bw, max_freq, min_freq)); + return gnuradio::make_block_sptr<pll_carriertracking_cc_impl>( + loop_bw, max_freq, min_freq); } pll_carriertracking_cc_impl::pll_carriertracking_cc_impl(float loop_bw, diff --git a/gr-analog/lib/pll_freqdet_cf_impl.cc b/gr-analog/lib/pll_freqdet_cf_impl.cc index baeecc7739..a450b00f5f 100644 --- a/gr-analog/lib/pll_freqdet_cf_impl.cc +++ b/gr-analog/lib/pll_freqdet_cf_impl.cc @@ -23,8 +23,7 @@ namespace analog { pll_freqdet_cf::sptr pll_freqdet_cf::make(float loop_bw, float max_freq, float min_freq) { - return gnuradio::get_initial_sptr( - new pll_freqdet_cf_impl(loop_bw, max_freq, min_freq)); + return gnuradio::make_block_sptr<pll_freqdet_cf_impl>(loop_bw, max_freq, min_freq); } pll_freqdet_cf_impl::pll_freqdet_cf_impl(float loop_bw, float max_freq, float min_freq) diff --git a/gr-analog/lib/pll_refout_cc_impl.cc b/gr-analog/lib/pll_refout_cc_impl.cc index 9824d12178..7aa184d978 100644 --- a/gr-analog/lib/pll_refout_cc_impl.cc +++ b/gr-analog/lib/pll_refout_cc_impl.cc @@ -22,8 +22,7 @@ namespace analog { pll_refout_cc::sptr pll_refout_cc::make(float loop_bw, float max_freq, float min_freq) { - return gnuradio::get_initial_sptr( - new pll_refout_cc_impl(loop_bw, max_freq, min_freq)); + return gnuradio::make_block_sptr<pll_refout_cc_impl>(loop_bw, max_freq, min_freq); } pll_refout_cc_impl::pll_refout_cc_impl(float loop_bw, float max_freq, float min_freq) diff --git a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc index 9c63719b27..de092966d4 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc +++ b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc @@ -21,7 +21,7 @@ namespace analog { probe_avg_mag_sqrd_c::sptr probe_avg_mag_sqrd_c::make(double threshold_db, double alpha) { - return gnuradio::get_initial_sptr(new probe_avg_mag_sqrd_c_impl(threshold_db, alpha)); + return gnuradio::make_block_sptr<probe_avg_mag_sqrd_c_impl>(threshold_db, alpha); } probe_avg_mag_sqrd_c_impl::probe_avg_mag_sqrd_c_impl(double threshold_db, double alpha) diff --git a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc index 7cc51856ef..2141bf54de 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc +++ b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc @@ -21,8 +21,7 @@ namespace analog { probe_avg_mag_sqrd_cf::sptr probe_avg_mag_sqrd_cf::make(double threshold_db, double alpha) { - return gnuradio::get_initial_sptr( - new probe_avg_mag_sqrd_cf_impl(threshold_db, alpha)); + return gnuradio::make_block_sptr<probe_avg_mag_sqrd_cf_impl>(threshold_db, alpha); } probe_avg_mag_sqrd_cf_impl::probe_avg_mag_sqrd_cf_impl(double threshold_db, double alpha) diff --git a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc index 13bb43f215..805c5c939d 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc +++ b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc @@ -21,7 +21,7 @@ namespace analog { probe_avg_mag_sqrd_f::sptr probe_avg_mag_sqrd_f::make(double threshold_db, double alpha) { - return gnuradio::get_initial_sptr(new probe_avg_mag_sqrd_f_impl(threshold_db, alpha)); + return gnuradio::make_block_sptr<probe_avg_mag_sqrd_f_impl>(threshold_db, alpha); } probe_avg_mag_sqrd_f_impl::probe_avg_mag_sqrd_f_impl(double threshold_db, double alpha) diff --git a/gr-analog/lib/pwr_squelch_cc_impl.cc b/gr-analog/lib/pwr_squelch_cc_impl.cc index a8b4572fea..a81b2918df 100644 --- a/gr-analog/lib/pwr_squelch_cc_impl.cc +++ b/gr-analog/lib/pwr_squelch_cc_impl.cc @@ -20,8 +20,7 @@ namespace analog { pwr_squelch_cc::sptr pwr_squelch_cc::make(double threshold, double alpha, int ramp, bool gate) { - return gnuradio::get_initial_sptr( - new pwr_squelch_cc_impl(threshold, alpha, ramp, gate)); + return gnuradio::make_block_sptr<pwr_squelch_cc_impl>(threshold, alpha, ramp, gate); } pwr_squelch_cc_impl::pwr_squelch_cc_impl(double threshold, diff --git a/gr-analog/lib/pwr_squelch_ff_impl.cc b/gr-analog/lib/pwr_squelch_ff_impl.cc index 12c6588413..40aeca27f2 100644 --- a/gr-analog/lib/pwr_squelch_ff_impl.cc +++ b/gr-analog/lib/pwr_squelch_ff_impl.cc @@ -20,8 +20,7 @@ namespace analog { pwr_squelch_ff::sptr pwr_squelch_ff::make(double threshold, double alpha, int ramp, bool gate) { - return gnuradio::get_initial_sptr( - new pwr_squelch_ff_impl(threshold, alpha, ramp, gate)); + return gnuradio::make_block_sptr<pwr_squelch_ff_impl>(threshold, alpha, ramp, gate); } pwr_squelch_ff_impl::pwr_squelch_ff_impl(double threshold, diff --git a/gr-analog/lib/quadrature_demod_cf_impl.cc b/gr-analog/lib/quadrature_demod_cf_impl.cc index d285b40fcd..a76b98a5e3 100644 --- a/gr-analog/lib/quadrature_demod_cf_impl.cc +++ b/gr-analog/lib/quadrature_demod_cf_impl.cc @@ -22,7 +22,7 @@ namespace analog { quadrature_demod_cf::sptr quadrature_demod_cf::make(float gain) { - return gnuradio::get_initial_sptr(new quadrature_demod_cf_impl(gain)); + return gnuradio::make_block_sptr<quadrature_demod_cf_impl>(gain); } quadrature_demod_cf_impl::quadrature_demod_cf_impl(float gain) diff --git a/gr-analog/lib/rail_ff_impl.cc b/gr-analog/lib/rail_ff_impl.cc index 17f2737fa5..33baddf3b9 100644 --- a/gr-analog/lib/rail_ff_impl.cc +++ b/gr-analog/lib/rail_ff_impl.cc @@ -21,7 +21,7 @@ namespace analog { rail_ff::sptr rail_ff::make(float lo, float hi) { - return gnuradio::get_initial_sptr(new rail_ff_impl(lo, hi)); + return gnuradio::make_block_sptr<rail_ff_impl>(lo, hi); } rail_ff_impl::rail_ff_impl(float lo, float hi) diff --git a/gr-analog/lib/random_uniform_source_impl.cc b/gr-analog/lib/random_uniform_source_impl.cc index 47f613de8d..9377169ee5 100644 --- a/gr-analog/lib/random_uniform_source_impl.cc +++ b/gr-analog/lib/random_uniform_source_impl.cc @@ -23,8 +23,8 @@ template <class T> typename random_uniform_source<T>::sptr random_uniform_source<T>::make(int minimum, int maximum, int seed) { - return gnuradio::get_initial_sptr( - new random_uniform_source_impl<T>(minimum, maximum, seed)); + return gnuradio::make_block_sptr<random_uniform_source_impl<T>>( + minimum, maximum, seed); } template <class T> diff --git a/gr-analog/lib/sig_source_impl.cc b/gr-analog/lib/sig_source_impl.cc index 3f2e45d758..55a4e14510 100644 --- a/gr-analog/lib/sig_source_impl.cc +++ b/gr-analog/lib/sig_source_impl.cc @@ -32,8 +32,8 @@ typename sig_source<T>::sptr sig_source<T>::make(double sampling_freq, T offset, float phase) { - return gnuradio::get_initial_sptr( - new sig_source_impl<T>(sampling_freq, waveform, frequency, ampl, offset, phase)); + return gnuradio::make_block_sptr<sig_source_impl<T>>( + sampling_freq, waveform, frequency, ampl, offset, phase); } template <class T> diff --git a/gr-analog/lib/simple_squelch_cc_impl.cc b/gr-analog/lib/simple_squelch_cc_impl.cc index 260bb522df..e89807fd8a 100644 --- a/gr-analog/lib/simple_squelch_cc_impl.cc +++ b/gr-analog/lib/simple_squelch_cc_impl.cc @@ -21,7 +21,7 @@ namespace analog { simple_squelch_cc::sptr simple_squelch_cc::make(double threshold_db, double alpha) { - return gnuradio::get_initial_sptr(new simple_squelch_cc_impl(threshold_db, alpha)); + return gnuradio::make_block_sptr<simple_squelch_cc_impl>(threshold_db, alpha); } simple_squelch_cc_impl::simple_squelch_cc_impl(double threshold_db, double alpha) 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> diff --git a/gr-channels/lib/cfo_model_impl.cc b/gr-channels/lib/cfo_model_impl.cc index 2ff85c3030..82aae7b528 100644 --- a/gr-channels/lib/cfo_model_impl.cc +++ b/gr-channels/lib/cfo_model_impl.cc @@ -21,8 +21,8 @@ cfo_model::sptr cfo_model::make(double sample_rate_hz, double max_dev_hz, double noise_seed) { - return gnuradio::get_initial_sptr( - new cfo_model_impl(sample_rate_hz, std_dev_hz, max_dev_hz, noise_seed)); + return gnuradio::make_block_sptr<cfo_model_impl>( + sample_rate_hz, std_dev_hz, max_dev_hz, noise_seed); } cfo_model_impl::cfo_model_impl(double sample_rate_hz, diff --git a/gr-channels/lib/channel_model2_impl.cc b/gr-channels/lib/channel_model2_impl.cc index d0d7be0be5..465e837675 100644 --- a/gr-channels/lib/channel_model2_impl.cc +++ b/gr-channels/lib/channel_model2_impl.cc @@ -22,8 +22,8 @@ channel_model2::sptr channel_model2::make(double noise_voltage, double noise_seed, bool block_tags) { - return gnuradio::get_initial_sptr( - new channel_model2_impl(noise_voltage, epsilon, taps, noise_seed, block_tags)); + return gnuradio::make_block_sptr<channel_model2_impl>( + noise_voltage, epsilon, taps, noise_seed, block_tags); } // Hierarchical block constructor diff --git a/gr-channels/lib/channel_model_impl.cc b/gr-channels/lib/channel_model_impl.cc index 52c16187fa..75a8e00eef 100644 --- a/gr-channels/lib/channel_model_impl.cc +++ b/gr-channels/lib/channel_model_impl.cc @@ -22,8 +22,8 @@ channel_model::sptr channel_model::make(double noise_voltage, double noise_seed, bool block_tags) { - return gnuradio::get_initial_sptr(new channel_model_impl( - noise_voltage, frequency_offset, epsilon, taps, noise_seed, block_tags)); + return gnuradio::make_block_sptr<channel_model_impl>( + noise_voltage, frequency_offset, epsilon, taps, noise_seed, block_tags); } // Hierarchical block constructor diff --git a/gr-channels/lib/dynamic_channel_model_impl.cc b/gr-channels/lib/dynamic_channel_model_impl.cc index e0ebe69cc8..dd15d2067f 100644 --- a/gr-channels/lib/dynamic_channel_model_impl.cc +++ b/gr-channels/lib/dynamic_channel_model_impl.cc @@ -30,20 +30,20 @@ dynamic_channel_model::sptr dynamic_channel_model::make(double samp_rate, double noise_amp, double noise_seed) { - return gnuradio::get_initial_sptr(new dynamic_channel_model_impl(samp_rate, - sro_std_dev, - sro_max_dev, - cfo_std_dev, - cfo_max_dev, - N, - doppler_freq, - LOS_model, - K, - delays, - mags, - ntaps_mpath, - noise_amp, - noise_seed)); + return gnuradio::make_block_sptr<dynamic_channel_model_impl>(samp_rate, + sro_std_dev, + sro_max_dev, + cfo_std_dev, + cfo_max_dev, + N, + doppler_freq, + LOS_model, + K, + delays, + mags, + ntaps_mpath, + noise_amp, + noise_seed); } // Hierarchical block constructor diff --git a/gr-channels/lib/fading_model_impl.cc b/gr-channels/lib/fading_model_impl.cc index 1832d15b24..0c037e9e7c 100644 --- a/gr-channels/lib/fading_model_impl.cc +++ b/gr-channels/lib/fading_model_impl.cc @@ -18,7 +18,7 @@ namespace channels { fading_model::sptr fading_model::make(unsigned int N, float fDTs, bool LOS, float K, uint32_t seed) { - return gnuradio::get_initial_sptr(new fading_model_impl(N, fDTs, LOS, K, seed)); + return gnuradio::make_block_sptr<fading_model_impl>(N, fDTs, LOS, K, seed); } // Block constructor diff --git a/gr-channels/lib/selective_fading_model2_impl.cc b/gr-channels/lib/selective_fading_model2_impl.cc index e094faa9b0..4f095646f2 100644 --- a/gr-channels/lib/selective_fading_model2_impl.cc +++ b/gr-channels/lib/selective_fading_model2_impl.cc @@ -34,8 +34,8 @@ selective_fading_model2::make(unsigned int N, std::vector<float> mags, unsigned int ntaps) { - return gnuradio::get_initial_sptr(new selective_fading_model2_impl( - N, fDTs, LOS, K, seed, delays, delays_std, delays_maxdev, mags, ntaps)); + return gnuradio::make_block_sptr<selective_fading_model2_impl>( + N, fDTs, LOS, K, seed, delays, delays_std, delays_maxdev, mags, ntaps); } // Block constructor diff --git a/gr-channels/lib/selective_fading_model_impl.cc b/gr-channels/lib/selective_fading_model_impl.cc index da9b2c3787..91b0c8d328 100644 --- a/gr-channels/lib/selective_fading_model_impl.cc +++ b/gr-channels/lib/selective_fading_model_impl.cc @@ -31,8 +31,8 @@ selective_fading_model::sptr selective_fading_model::make(unsigned int N, std::vector<float> mags, int ntaps) { - return gnuradio::get_initial_sptr( - new selective_fading_model_impl(N, fDTs, LOS, K, seed, delays, mags, ntaps)); + return gnuradio::make_block_sptr<selective_fading_model_impl>( + N, fDTs, LOS, K, seed, delays, mags, ntaps); } // Block constructor diff --git a/gr-channels/lib/sro_model_impl.cc b/gr-channels/lib/sro_model_impl.cc index 9be24a8cd0..0362ab3ca9 100644 --- a/gr-channels/lib/sro_model_impl.cc +++ b/gr-channels/lib/sro_model_impl.cc @@ -24,8 +24,8 @@ sro_model::sptr sro_model::make(double sample_rate_hz, double max_dev_hz, double noise_seed) { - return gnuradio::get_initial_sptr( - new sro_model_impl(sample_rate_hz, std_dev_hz, max_dev_hz, noise_seed)); + return gnuradio::make_block_sptr<sro_model_impl>( + sample_rate_hz, std_dev_hz, max_dev_hz, noise_seed); } sro_model_impl::sro_model_impl(double sample_rate_hz, 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, diff --git a/gr-dtv/lib/atsc/atsc_deinterleaver_impl.cc b/gr-dtv/lib/atsc/atsc_deinterleaver_impl.cc index b6cca0c8d8..a906bf8597 100644 --- a/gr-dtv/lib/atsc/atsc_deinterleaver_impl.cc +++ b/gr-dtv/lib/atsc/atsc_deinterleaver_impl.cc @@ -21,7 +21,7 @@ namespace dtv { atsc_deinterleaver::sptr atsc_deinterleaver::make() { - return gnuradio::get_initial_sptr(new atsc_deinterleaver_impl()); + return gnuradio::make_block_sptr<atsc_deinterleaver_impl>(); } atsc_deinterleaver_impl::atsc_deinterleaver_impl() diff --git a/gr-dtv/lib/atsc/atsc_depad_impl.cc b/gr-dtv/lib/atsc/atsc_depad_impl.cc index fa60c0ee29..a6d87a7362 100644 --- a/gr-dtv/lib/atsc/atsc_depad_impl.cc +++ b/gr-dtv/lib/atsc/atsc_depad_impl.cc @@ -21,7 +21,7 @@ namespace dtv { atsc_depad::sptr atsc_depad::make() { - return gnuradio::get_initial_sptr(new atsc_depad_impl()); + return gnuradio::make_block_sptr<atsc_depad_impl>(); } atsc_depad_impl::atsc_depad_impl() diff --git a/gr-dtv/lib/atsc/atsc_derandomizer_impl.cc b/gr-dtv/lib/atsc/atsc_derandomizer_impl.cc index 4e67e59231..2b102838f0 100644 --- a/gr-dtv/lib/atsc/atsc_derandomizer_impl.cc +++ b/gr-dtv/lib/atsc/atsc_derandomizer_impl.cc @@ -21,7 +21,7 @@ namespace dtv { atsc_derandomizer::sptr atsc_derandomizer::make() { - return gnuradio::get_initial_sptr(new atsc_derandomizer_impl()); + return gnuradio::make_block_sptr<atsc_derandomizer_impl>(); } atsc_derandomizer_impl::atsc_derandomizer_impl() diff --git a/gr-dtv/lib/atsc/atsc_equalizer_impl.cc b/gr-dtv/lib/atsc/atsc_equalizer_impl.cc index b10837fcab..6c701d607b 100644 --- a/gr-dtv/lib/atsc/atsc_equalizer_impl.cc +++ b/gr-dtv/lib/atsc/atsc_equalizer_impl.cc @@ -23,7 +23,7 @@ namespace dtv { atsc_equalizer::sptr atsc_equalizer::make() { - return gnuradio::get_initial_sptr(new atsc_equalizer_impl()); + return gnuradio::make_block_sptr<atsc_equalizer_impl>(); } static float bin_map(int bit) { return bit ? +5 : -5; } diff --git a/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.cc b/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.cc index 3729207629..0e778a983d 100644 --- a/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.cc +++ b/gr-dtv/lib/atsc/atsc_field_sync_mux_impl.cc @@ -19,7 +19,7 @@ namespace dtv { atsc_field_sync_mux::sptr atsc_field_sync_mux::make() { - return gnuradio::get_initial_sptr(new atsc_field_sync_mux_impl()); + return gnuradio::make_block_sptr<atsc_field_sync_mux_impl>(); } atsc_field_sync_mux_impl::atsc_field_sync_mux_impl() diff --git a/gr-dtv/lib/atsc/atsc_fpll_impl.cc b/gr-dtv/lib/atsc/atsc_fpll_impl.cc index 88d9940615..0904d1aad0 100644 --- a/gr-dtv/lib/atsc/atsc_fpll_impl.cc +++ b/gr-dtv/lib/atsc/atsc_fpll_impl.cc @@ -22,7 +22,7 @@ namespace dtv { atsc_fpll::sptr atsc_fpll::make(float rate) { - return gnuradio::get_initial_sptr(new atsc_fpll_impl(rate)); + return gnuradio::make_block_sptr<atsc_fpll_impl>(rate); } atsc_fpll_impl::atsc_fpll_impl(float rate) diff --git a/gr-dtv/lib/atsc/atsc_fs_checker_impl.cc b/gr-dtv/lib/atsc/atsc_fs_checker_impl.cc index 2295bd783c..dd76277be9 100644 --- a/gr-dtv/lib/atsc/atsc_fs_checker_impl.cc +++ b/gr-dtv/lib/atsc/atsc_fs_checker_impl.cc @@ -30,7 +30,7 @@ namespace dtv { atsc_fs_checker::sptr atsc_fs_checker::make() { - return gnuradio::get_initial_sptr(new atsc_fs_checker_impl()); + return gnuradio::make_block_sptr<atsc_fs_checker_impl>(); } atsc_fs_checker_impl::atsc_fs_checker_impl() diff --git a/gr-dtv/lib/atsc/atsc_interleaver_impl.cc b/gr-dtv/lib/atsc/atsc_interleaver_impl.cc index 18508b93bf..07b748029a 100644 --- a/gr-dtv/lib/atsc/atsc_interleaver_impl.cc +++ b/gr-dtv/lib/atsc/atsc_interleaver_impl.cc @@ -18,7 +18,7 @@ namespace dtv { atsc_interleaver::sptr atsc_interleaver::make() { - return gnuradio::get_initial_sptr(new atsc_interleaver_impl()); + return gnuradio::make_block_sptr<atsc_interleaver_impl>(); } atsc_interleaver_impl::atsc_interleaver_impl() diff --git a/gr-dtv/lib/atsc/atsc_pad_impl.cc b/gr-dtv/lib/atsc/atsc_pad_impl.cc index 144b052252..db5fc7d47c 100644 --- a/gr-dtv/lib/atsc/atsc_pad_impl.cc +++ b/gr-dtv/lib/atsc/atsc_pad_impl.cc @@ -16,10 +16,7 @@ namespace gr { namespace dtv { -atsc_pad::sptr atsc_pad::make() -{ - return gnuradio::get_initial_sptr(new atsc_pad_impl()); -} +atsc_pad::sptr atsc_pad::make() { return gnuradio::make_block_sptr<atsc_pad_impl>(); } atsc_pad_impl::atsc_pad_impl() : gr::sync_decimator("atsc_pad", diff --git a/gr-dtv/lib/atsc/atsc_randomizer_impl.cc b/gr-dtv/lib/atsc/atsc_randomizer_impl.cc index 8d83f0d0ab..fcd029cac7 100644 --- a/gr-dtv/lib/atsc/atsc_randomizer_impl.cc +++ b/gr-dtv/lib/atsc/atsc_randomizer_impl.cc @@ -19,7 +19,7 @@ namespace dtv { atsc_randomizer::sptr atsc_randomizer::make() { - return gnuradio::get_initial_sptr(new atsc_randomizer_impl()); + return gnuradio::make_block_sptr<atsc_randomizer_impl>(); } atsc_randomizer_impl::atsc_randomizer_impl() diff --git a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc index 3d4eca49c3..a22fffe537 100644 --- a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc +++ b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc @@ -31,7 +31,7 @@ static const int amount_of_pad = N - ATSC_MPEG_RS_ENCODED_LENGTH; // 48 atsc_rs_decoder::sptr atsc_rs_decoder::make() { - return gnuradio::get_initial_sptr(new atsc_rs_decoder_impl()); + return gnuradio::make_block_sptr<atsc_rs_decoder_impl>(); } atsc_rs_decoder_impl::atsc_rs_decoder_impl() diff --git a/gr-dtv/lib/atsc/atsc_rs_encoder_impl.cc b/gr-dtv/lib/atsc/atsc_rs_encoder_impl.cc index e9619c35ed..784547142f 100644 --- a/gr-dtv/lib/atsc/atsc_rs_encoder_impl.cc +++ b/gr-dtv/lib/atsc/atsc_rs_encoder_impl.cc @@ -29,7 +29,7 @@ static const int amount_of_pad = N - ATSC_MPEG_RS_ENCODED_LENGTH; // 48 atsc_rs_encoder::sptr atsc_rs_encoder::make() { - return gnuradio::get_initial_sptr(new atsc_rs_encoder_impl()); + return gnuradio::make_block_sptr<atsc_rs_encoder_impl>(); } atsc_rs_encoder_impl::atsc_rs_encoder_impl() diff --git a/gr-dtv/lib/atsc/atsc_sync_impl.cc b/gr-dtv/lib/atsc/atsc_sync_impl.cc index c2f45d77bd..2cff86358c 100644 --- a/gr-dtv/lib/atsc/atsc_sync_impl.cc +++ b/gr-dtv/lib/atsc/atsc_sync_impl.cc @@ -28,7 +28,7 @@ static const signed char SSI_MAX = 15; atsc_sync::sptr atsc_sync::make(float rate) { - return gnuradio::get_initial_sptr(new atsc_sync_impl(rate)); + return gnuradio::make_block_sptr<atsc_sync_impl>(rate); } atsc_sync_impl::atsc_sync_impl(float rate) diff --git a/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc b/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc index 9dc7e4ccc4..bdc6f71068 100644 --- a/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc +++ b/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc @@ -37,7 +37,7 @@ static const int bit2[8] = { 0, 99, 2, 98, 4, 97, 6, 96 }; atsc_trellis_encoder::sptr atsc_trellis_encoder::make() { - return gnuradio::get_initial_sptr(new atsc_trellis_encoder_impl()); + return gnuradio::make_block_sptr<atsc_trellis_encoder_impl>(); } atsc_trellis_encoder_impl::atsc_trellis_encoder_impl() diff --git a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc index c0eb94c659..c80731000b 100644 --- a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc +++ b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc @@ -22,7 +22,7 @@ namespace dtv { atsc_viterbi_decoder::sptr atsc_viterbi_decoder::make() { - return gnuradio::get_initial_sptr(new atsc_viterbi_decoder_impl()); + return gnuradio::make_block_sptr<atsc_viterbi_decoder_impl>(); } atsc_viterbi_decoder_impl::atsc_viterbi_decoder_impl() diff --git a/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc b/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc index 356ae69c06..f85d9422a9 100644 --- a/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc +++ b/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc @@ -19,8 +19,8 @@ namespace dtv { catv_frame_sync_enc_bb::sptr catv_frame_sync_enc_bb::make(catv_constellation_t constellation, int ctrlword) { - return gnuradio::get_initial_sptr( - new catv_frame_sync_enc_bb_impl(constellation, ctrlword)); + return gnuradio::make_block_sptr<catv_frame_sync_enc_bb_impl>(constellation, + ctrlword); } /* diff --git a/gr-dtv/lib/catv/catv_randomizer_bb_impl.cc b/gr-dtv/lib/catv/catv_randomizer_bb_impl.cc index 061b9decdb..c0fd75a265 100644 --- a/gr-dtv/lib/catv/catv_randomizer_bb_impl.cc +++ b/gr-dtv/lib/catv/catv_randomizer_bb_impl.cc @@ -18,7 +18,7 @@ namespace dtv { catv_randomizer_bb::sptr catv_randomizer_bb::make(catv_constellation_t constellation) { - return gnuradio::get_initial_sptr(new catv_randomizer_bb_impl(constellation)); + return gnuradio::make_block_sptr<catv_randomizer_bb_impl>(constellation); } /* diff --git a/gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc b/gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc index ef1d7f798d..63b06cff86 100644 --- a/gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc +++ b/gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc @@ -18,7 +18,7 @@ namespace dtv { catv_reed_solomon_enc_bb::sptr catv_reed_solomon_enc_bb::make() { - return gnuradio::get_initial_sptr(new catv_reed_solomon_enc_bb_impl()); + return gnuradio::make_block_sptr<catv_reed_solomon_enc_bb_impl>(); } /* diff --git a/gr-dtv/lib/catv/catv_transport_framing_enc_bb_impl.cc b/gr-dtv/lib/catv/catv_transport_framing_enc_bb_impl.cc index 94b5dbee8f..e0a5b0b3b7 100644 --- a/gr-dtv/lib/catv/catv_transport_framing_enc_bb_impl.cc +++ b/gr-dtv/lib/catv/catv_transport_framing_enc_bb_impl.cc @@ -18,7 +18,7 @@ namespace dtv { catv_transport_framing_enc_bb::sptr catv_transport_framing_enc_bb::make() { - return gnuradio::get_initial_sptr(new catv_transport_framing_enc_bb_impl()); + return gnuradio::make_block_sptr<catv_transport_framing_enc_bb_impl>(); } /* diff --git a/gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc b/gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc index 7c1929b7e9..24b0154351 100644 --- a/gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc +++ b/gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc @@ -18,7 +18,7 @@ namespace dtv { catv_trellis_enc_bb::sptr catv_trellis_enc_bb::make(catv_constellation_t constellation) { - return gnuradio::get_initial_sptr(new catv_trellis_enc_bb_impl(constellation)); + return gnuradio::make_block_sptr<catv_trellis_enc_bb_impl>(constellation); } /* diff --git a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc index 117027ffde..da7daf9e54 100644 --- a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc +++ b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc @@ -25,8 +25,8 @@ dvb_bbheader_bb::sptr dvb_bbheader_bb::make(dvb_standard_t standard, int fecblocks, int tsrate) { - return gnuradio::get_initial_sptr(new dvb_bbheader_bb_impl( - standard, framesize, rate, rolloff, mode, inband, fecblocks, tsrate)); + return gnuradio::make_block_sptr<dvb_bbheader_bb_impl>( + standard, framesize, rate, rolloff, mode, inband, fecblocks, tsrate); } /* diff --git a/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc b/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc index c0e730d25f..ed6f8c31f0 100644 --- a/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc +++ b/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc @@ -20,8 +20,7 @@ dvb_bbscrambler_bb::sptr dvb_bbscrambler_bb::make(dvb_standard_t standard, dvb_framesize_t framesize, dvb_code_rate_t rate) { - return gnuradio::get_initial_sptr( - new dvb_bbscrambler_bb_impl(standard, framesize, rate)); + return gnuradio::make_block_sptr<dvb_bbscrambler_bb_impl>(standard, framesize, rate); } /* diff --git a/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc b/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc index ce27e83d94..002ff28a2b 100644 --- a/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc +++ b/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc @@ -19,7 +19,7 @@ namespace dtv { dvb_bch_bb::sptr dvb_bch_bb::make(dvb_standard_t standard, dvb_framesize_t framesize, dvb_code_rate_t rate) { - return gnuradio::get_initial_sptr(new dvb_bch_bb_impl(standard, framesize, rate)); + return gnuradio::make_block_sptr<dvb_bch_bb_impl>(standard, framesize, rate); } /* diff --git a/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc b/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc index 25541376e0..b401dd8d9e 100644 --- a/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc +++ b/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc @@ -21,8 +21,8 @@ dvb_ldpc_bb::sptr dvb_ldpc_bb::make(dvb_standard_t standard, dvb_code_rate_t rate, dvb_constellation_t constellation) { - return gnuradio::get_initial_sptr( - new dvb_ldpc_bb_impl(standard, framesize, rate, constellation)); + return gnuradio::make_block_sptr<dvb_ldpc_bb_impl>( + standard, framesize, rate, constellation); } /* diff --git a/gr-dtv/lib/dvbs2/dvbs2_interleaver_bb_impl.cc b/gr-dtv/lib/dvbs2/dvbs2_interleaver_bb_impl.cc index c138e8eb59..1adbc5d549 100644 --- a/gr-dtv/lib/dvbs2/dvbs2_interleaver_bb_impl.cc +++ b/gr-dtv/lib/dvbs2/dvbs2_interleaver_bb_impl.cc @@ -20,8 +20,8 @@ dvbs2_interleaver_bb::sptr dvbs2_interleaver_bb::make(dvb_framesize_t framesize, dvb_code_rate_t rate, dvb_constellation_t constellation) { - return gnuradio::get_initial_sptr( - new dvbs2_interleaver_bb_impl(framesize, rate, constellation)); + return gnuradio::make_block_sptr<dvbs2_interleaver_bb_impl>( + framesize, rate, constellation); } /* diff --git a/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc b/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc index 3588185db3..61a160a68d 100644 --- a/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc +++ b/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc @@ -22,8 +22,8 @@ dvbs2_modulator_bc::sptr dvbs2_modulator_bc::make(dvb_framesize_t framesize, dvb_constellation_t constellation, dvbs2_interpolation_t interpolation) { - return gnuradio::get_initial_sptr( - new dvbs2_modulator_bc_impl(framesize, rate, constellation, interpolation)); + return gnuradio::make_block_sptr<dvbs2_modulator_bc_impl>( + framesize, rate, constellation, interpolation); } /* diff --git a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc index f86c72c0aa..f3b447b94d 100644 --- a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc +++ b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc @@ -23,8 +23,8 @@ dvbs2_physical_cc::sptr dvbs2_physical_cc::make(dvb_framesize_t framesize, dvbs2_pilots_t pilots, int goldcode) { - return gnuradio::get_initial_sptr( - new dvbs2_physical_cc_impl(framesize, rate, constellation, pilots, goldcode)); + return gnuradio::make_block_sptr<dvbs2_physical_cc_impl>( + framesize, rate, constellation, pilots, goldcode); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc index 9d14873017..0f3db068c8 100644 --- a/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc @@ -27,8 +27,8 @@ dvbt_bit_inner_deinterleaver::make(int nsize, dvbt_hierarchy_t hierarchy, dvbt_transmission_mode_t transmission) { - return gnuradio::get_initial_sptr(new dvbt_bit_inner_deinterleaver_impl( - nsize, constellation, hierarchy, transmission)); + return gnuradio::make_block_sptr<dvbt_bit_inner_deinterleaver_impl>( + nsize, constellation, hierarchy, transmission); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc index 62ce356a38..f984dd5f15 100644 --- a/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc @@ -28,8 +28,8 @@ dvbt_bit_inner_interleaver::make(int nsize, dvbt_hierarchy_t hierarchy, dvbt_transmission_mode_t transmission) { - return gnuradio::get_initial_sptr(new dvbt_bit_inner_interleaver_impl( - nsize, constellation, hierarchy, transmission)); + return gnuradio::make_block_sptr<dvbt_bit_inner_interleaver_impl>( + nsize, constellation, hierarchy, transmission); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_deinterleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_convolutional_deinterleaver_impl.cc index e67422fc46..17867ca458 100644 --- a/gr-dtv/lib/dvbt/dvbt_convolutional_deinterleaver_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_convolutional_deinterleaver_impl.cc @@ -23,8 +23,7 @@ const int dvbt_convolutional_deinterleaver_impl::d_MUX_PKT = 8; dvbt_convolutional_deinterleaver::sptr dvbt_convolutional_deinterleaver::make(int nsize, int I, int M) { - return gnuradio::get_initial_sptr( - new dvbt_convolutional_deinterleaver_impl(nsize, I, M)); + return gnuradio::make_block_sptr<dvbt_convolutional_deinterleaver_impl>(nsize, I, M); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc index 7d0bb25651..37b8769d4f 100644 --- a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc @@ -20,8 +20,7 @@ namespace dtv { dvbt_convolutional_interleaver::sptr dvbt_convolutional_interleaver::make(int nsize, int I, int M) { - return gnuradio::get_initial_sptr( - new dvbt_convolutional_interleaver_impl(nsize, I, M)); + return gnuradio::make_block_sptr<dvbt_convolutional_interleaver_impl>(nsize, I, M); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_demap_impl.cc b/gr-dtv/lib/dvbt/dvbt_demap_impl.cc index 3b0ab9d54d..3eaa98a024 100644 --- a/gr-dtv/lib/dvbt/dvbt_demap_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_demap_impl.cc @@ -23,8 +23,8 @@ dvbt_demap::sptr dvbt_demap::make(int nsize, dvbt_transmission_mode_t transmission, float gain) { - return gnuradio::get_initial_sptr( - new dvbt_demap_impl(nsize, constellation, hierarchy, transmission, gain)); + return gnuradio::make_block_sptr<dvbt_demap_impl>( + nsize, constellation, hierarchy, transmission, gain); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc b/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc index d5869a0242..606221e238 100644 --- a/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_demod_reference_signals_impl.cc @@ -29,18 +29,17 @@ dvbt_demod_reference_signals::make(int itemsize, int include_cell_id, int cell_id) { - return gnuradio::get_initial_sptr( - new dvbt_demod_reference_signals_impl(itemsize, - ninput, - noutput, - constellation, - hierarchy, - code_rate_HP, - code_rate_LP, - guard_interval, - transmission_mode, - include_cell_id, - cell_id)); + return gnuradio::make_block_sptr<dvbt_demod_reference_signals_impl>(itemsize, + ninput, + noutput, + constellation, + hierarchy, + code_rate_HP, + code_rate_LP, + guard_interval, + transmission_mode, + include_cell_id, + cell_id); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_energy_descramble_impl.cc b/gr-dtv/lib/dvbt/dvbt_energy_descramble_impl.cc index d331413c32..7a3a09efac 100644 --- a/gr-dtv/lib/dvbt/dvbt_energy_descramble_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_energy_descramble_impl.cc @@ -41,7 +41,7 @@ int dvbt_energy_descramble_impl::clock_prbs(int clocks) dvbt_energy_descramble::sptr dvbt_energy_descramble::make(int nblocks) { - return gnuradio::get_initial_sptr(new dvbt_energy_descramble_impl(nblocks)); + return gnuradio::make_block_sptr<dvbt_energy_descramble_impl>(nblocks); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc b/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc index 755a44bc16..c9bbf7d912 100644 --- a/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc @@ -38,7 +38,7 @@ int dvbt_energy_dispersal_impl::clock_prbs(int clocks) dvbt_energy_dispersal::sptr dvbt_energy_dispersal::make(int nblocks) { - return gnuradio::get_initial_sptr(new dvbt_energy_dispersal_impl(nblocks)); + return gnuradio::make_block_sptr<dvbt_energy_dispersal_impl>(nblocks); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc index dc49f218a0..6e2d989e88 100644 --- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc @@ -113,8 +113,8 @@ dvbt_inner_coder::sptr dvbt_inner_coder::make(int ninput, dvbt_hierarchy_t hierarchy, dvb_code_rate_t coderate) { - return gnuradio::get_initial_sptr( - new dvbt_inner_coder_impl(ninput, noutput, constellation, hierarchy, coderate)); + return gnuradio::make_block_sptr<dvbt_inner_coder_impl>( + ninput, noutput, constellation, hierarchy, coderate); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_map_impl.cc b/gr-dtv/lib/dvbt/dvbt_map_impl.cc index 06d920cfc4..48afea560e 100644 --- a/gr-dtv/lib/dvbt/dvbt_map_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_map_impl.cc @@ -24,8 +24,8 @@ dvbt_map::sptr dvbt_map::make(int nsize, dvbt_transmission_mode_t transmission, float gain) { - return gnuradio::get_initial_sptr( - new dvbt_map_impl(nsize, constellation, hierarchy, transmission, gain)); + return gnuradio::make_block_sptr<dvbt_map_impl>( + nsize, constellation, hierarchy, transmission, gain); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc index a205efd150..ad0166e6c4 100644 --- a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc @@ -216,8 +216,8 @@ void dvbt_ofdm_sym_acquisition_impl::derotate(const gr_complex* in, gr_complex* dvbt_ofdm_sym_acquisition::sptr dvbt_ofdm_sym_acquisition::make( int blocks, int fft_length, int occupied_tones, int cp_length, float snr) { - return gnuradio::get_initial_sptr(new dvbt_ofdm_sym_acquisition_impl( - blocks, fft_length, occupied_tones, cp_length, snr)); + return gnuradio::make_block_sptr<dvbt_ofdm_sym_acquisition_impl>( + blocks, fft_length, occupied_tones, cp_length, snr); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc index d626af5fee..88a0cc2e02 100644 --- a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc @@ -24,8 +24,8 @@ static const int N = (1 << rs_init_symsize) - 1; // 255 dvbt_reed_solomon_dec::sptr dvbt_reed_solomon_dec::make( int p, int m, int gfpoly, int n, int k, int t, int s, int blocks) { - return gnuradio::get_initial_sptr( - new dvbt_reed_solomon_dec_impl(p, m, gfpoly, n, k, t, s, blocks)); + return gnuradio::make_block_sptr<dvbt_reed_solomon_dec_impl>( + p, m, gfpoly, n, k, t, s, blocks); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc b/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc index d9ac91d07a..3761de1921 100644 --- a/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc @@ -23,8 +23,8 @@ static const int rs_init_prim = 1; // primitive is 1 (alpha) dvbt_reed_solomon_enc::sptr dvbt_reed_solomon_enc::make( int p, int m, int gfpoly, int n, int k, int t, int s, int blocks) { - return gnuradio::get_initial_sptr( - new dvbt_reed_solomon_enc_impl(p, m, gfpoly, n, k, t, s, blocks)); + return gnuradio::make_block_sptr<dvbt_reed_solomon_enc_impl>( + p, m, gfpoly, n, k, t, s, blocks); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc index 73db55bb0f..2ef1ff53ca 100644 --- a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc @@ -1158,17 +1158,17 @@ dvbt_reference_signals::make(int itemsize, int include_cell_id, int cell_id) { - return gnuradio::get_initial_sptr(new dvbt_reference_signals_impl(itemsize, - ninput, - noutput, - constellation, - hierarchy, - code_rate_HP, - code_rate_LP, - guard_interval, - transmission_mode, - include_cell_id, - cell_id)); + return gnuradio::make_block_sptr<dvbt_reference_signals_impl>(itemsize, + ninput, + noutput, + constellation, + hierarchy, + code_rate_HP, + code_rate_LP, + guard_interval, + transmission_mode, + include_cell_id, + cell_id); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc index 596b2000e4..2bccc258bd 100644 --- a/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc @@ -78,8 +78,8 @@ int dvbt_symbol_inner_interleaver_impl::calculate_R(int i) dvbt_symbol_inner_interleaver::sptr dvbt_symbol_inner_interleaver::make( int nsize, dvbt_transmission_mode_t transmission, int direction) { - return gnuradio::get_initial_sptr( - new dvbt_symbol_inner_interleaver_impl(nsize, transmission, direction)); + return gnuradio::make_block_sptr<dvbt_symbol_inner_interleaver_impl>( + nsize, transmission, direction); } /* diff --git a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc index 22d1d54c0e..c32ac47688 100644 --- a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc @@ -503,8 +503,8 @@ dvbt_viterbi_decoder::sptr dvbt_viterbi_decoder::make(dvb_constellation_t conste dvb_code_rate_t coderate, int bsize) { - return gnuradio::get_initial_sptr( - new dvbt_viterbi_decoder_impl(constellation, hierarchy, coderate, bsize)); + return gnuradio::make_block_sptr<dvbt_viterbi_decoder_impl>( + constellation, hierarchy, coderate, bsize); } /* diff --git a/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc index a4c6c006ab..ccb8b52aec 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc +++ b/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc @@ -22,8 +22,8 @@ dvbt2_cellinterleaver_cc::make(dvb_framesize_t framesize, int fecblocks, int tiblocks) { - return gnuradio::get_initial_sptr( - new dvbt2_cellinterleaver_cc_impl(framesize, constellation, fecblocks, tiblocks)); + return gnuradio::make_block_sptr<dvbt2_cellinterleaver_cc_impl>( + framesize, constellation, fecblocks, tiblocks); } /* diff --git a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc index 5529f1d9e3..c3448c472c 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc +++ b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc @@ -39,26 +39,26 @@ dvbt2_framemapper_cc::make(dvb_framesize_t framesize, dvbt2_l1scrambled_t l1scrambled, dvbt2_inband_t inband) { - return gnuradio::get_initial_sptr(new dvbt2_framemapper_cc_impl(framesize, - rate, - constellation, - rotation, - fecblocks, - tiblocks, - carriermode, - fftsize, - guardinterval, - l1constellation, - pilotpattern, - t2frames, - numdatasyms, - paprmode, - version, - preamble, - inputmode, - reservedbiasbits, - l1scrambled, - inband)); + return gnuradio::make_block_sptr<dvbt2_framemapper_cc_impl>(framesize, + rate, + constellation, + rotation, + fecblocks, + tiblocks, + carriermode, + fftsize, + guardinterval, + l1constellation, + pilotpattern, + t2frames, + numdatasyms, + paprmode, + version, + preamble, + inputmode, + reservedbiasbits, + l1scrambled, + inband); } /* diff --git a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc index 2ff3b0db4c..44559fa65d 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc +++ b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc @@ -26,14 +26,14 @@ dvbt2_freqinterleaver_cc::make(dvbt2_extended_carrier_t carriermode, dvbt2_version_t version, dvbt2_preamble_t preamble) { - return gnuradio::get_initial_sptr(new dvbt2_freqinterleaver_cc_impl(carriermode, - fftsize, - pilotpattern, - guardinterval, - numdatasyms, - paprmode, - version, - preamble)); + return gnuradio::make_block_sptr<dvbt2_freqinterleaver_cc_impl>(carriermode, + fftsize, + pilotpattern, + guardinterval, + numdatasyms, + paprmode, + version, + preamble); } /* diff --git a/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc index cfb4487232..8bc61eba61 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc +++ b/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc @@ -20,8 +20,8 @@ dvbt2_interleaver_bb::sptr dvbt2_interleaver_bb::make(dvb_framesize_t framesize, dvb_code_rate_t rate, dvb_constellation_t constellation) { - return gnuradio::get_initial_sptr( - new dvbt2_interleaver_bb_impl(framesize, rate, constellation)); + return gnuradio::make_block_sptr<dvbt2_interleaver_bb_impl>( + framesize, rate, constellation); } /* diff --git a/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc index 95048bb813..2f2fde1952 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc +++ b/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc @@ -23,8 +23,8 @@ dvbt2_miso_cc::sptr dvbt2_miso_cc::make(dvbt2_extended_carrier_t carriermode, int numdatasyms, dvbt2_papr_t paprmode) { - return gnuradio::get_initial_sptr(new dvbt2_miso_cc_impl( - carriermode, fftsize, pilotpattern, guardinterval, numdatasyms, paprmode)); + return gnuradio::make_block_sptr<dvbt2_miso_cc_impl>( + carriermode, fftsize, pilotpattern, guardinterval, numdatasyms, paprmode); } /* diff --git a/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc index bef4635a8c..6ef987b61b 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc +++ b/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc @@ -21,8 +21,8 @@ dvbt2_modulator_bc::sptr dvbt2_modulator_bc::make(dvb_framesize_t framesize, dvb_constellation_t constellation, dvbt2_rotation_t rotation) { - return gnuradio::get_initial_sptr( - new dvbt2_modulator_bc_impl(framesize, constellation, rotation)); + return gnuradio::make_block_sptr<dvbt2_modulator_bc_impl>( + framesize, constellation, rotation); } /* diff --git a/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc index e8233cdd26..3025113d1c 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc +++ b/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc @@ -27,8 +27,8 @@ dvbt2_p1insertion_cc::make(dvbt2_extended_carrier_t carriermode, dvbt2_showlevels_t showlevels, float vclip) { - return gnuradio::get_initial_sptr(new dvbt2_p1insertion_cc_impl( - carriermode, fftsize, guardinterval, numdatasyms, preamble, showlevels, vclip)); + return gnuradio::make_block_sptr<dvbt2_p1insertion_cc_impl>( + carriermode, fftsize, guardinterval, numdatasyms, preamble, showlevels, vclip); } /* diff --git a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc index 211dea1ac1..33672fd632 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc +++ b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc @@ -34,16 +34,16 @@ dvbt2_paprtr_cc::sptr dvbt2_paprtr_cc::make(dvbt2_extended_carrier_t carriermode int iterations, unsigned int vlength) { - return gnuradio::get_initial_sptr(new dvbt2_paprtr_cc_impl(carriermode, - fftsize, - pilotpattern, - guardinterval, - numdatasyms, - paprmode, - version, - vclip, - iterations, - vlength)); + return gnuradio::make_block_sptr<dvbt2_paprtr_cc_impl>(carriermode, + fftsize, + pilotpattern, + guardinterval, + numdatasyms, + paprmode, + version, + vclip, + iterations, + vlength); } /* diff --git a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc index a387948967..188821abce 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc +++ b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc @@ -32,18 +32,18 @@ dvbt2_pilotgenerator_cc::make(dvbt2_extended_carrier_t carriermode, dvbt2_bandwidth_t bandwidth, unsigned int vlength) { - return gnuradio::get_initial_sptr(new dvbt2_pilotgenerator_cc_impl(carriermode, - fftsize, - pilotpattern, - guardinterval, - numdatasyms, - paprmode, - version, - preamble, - misogroup, - equalization, - bandwidth, - vlength)); + return gnuradio::make_block_sptr<dvbt2_pilotgenerator_cc_impl>(carriermode, + fftsize, + pilotpattern, + guardinterval, + numdatasyms, + paprmode, + version, + preamble, + misogroup, + equalization, + bandwidth, + vlength); } /* diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc index 7188c23cc4..e8c04829b9 100644 --- a/gr-fec/lib/async_decoder_impl.cc +++ b/gr-fec/lib/async_decoder_impl.cc @@ -23,8 +23,8 @@ namespace fec { async_decoder::sptr async_decoder::make(generic_decoder::sptr my_decoder, bool packed, bool rev_pack, int mtu) { - return gnuradio::get_initial_sptr( - new async_decoder_impl(my_decoder, packed, rev_pack, mtu)); + return gnuradio::make_block_sptr<async_decoder_impl>( + my_decoder, packed, rev_pack, mtu); } async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder, diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc index e8d24ad331..1dcfc3658e 100644 --- a/gr-fec/lib/async_encoder_impl.cc +++ b/gr-fec/lib/async_encoder_impl.cc @@ -26,8 +26,8 @@ async_encoder::sptr async_encoder::make(generic_encoder::sptr my_encoder, bool rev_pack, int mtu) { - return gnuradio::get_initial_sptr( - new async_encoder_impl(my_encoder, packed, rev_unpack, rev_pack, mtu)); + return gnuradio::make_block_sptr<async_encoder_impl>( + my_encoder, packed, rev_unpack, rev_pack, mtu); } async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder, diff --git a/gr-fec/lib/ber_bf_impl.cc b/gr-fec/lib/ber_bf_impl.cc index 3f9c6ccb72..c35a7eca5c 100644 --- a/gr-fec/lib/ber_bf_impl.cc +++ b/gr-fec/lib/ber_bf_impl.cc @@ -22,8 +22,7 @@ namespace fec { ber_bf::sptr ber_bf::make(bool test_mode, int berminerrors, float ber_limit) { - return gnuradio::get_initial_sptr( - new ber_bf_impl(test_mode, berminerrors, ber_limit)); + return gnuradio::make_block_sptr<ber_bf_impl>(test_mode, berminerrors, ber_limit); } ber_bf_impl::ber_bf_impl(bool test_mode, int berminerrors, float ber_limit) diff --git a/gr-fec/lib/conv_bit_corr_bb_impl.cc b/gr-fec/lib/conv_bit_corr_bb_impl.cc index f99eaadb50..f6fc2aa048 100644 --- a/gr-fec/lib/conv_bit_corr_bb_impl.cc +++ b/gr-fec/lib/conv_bit_corr_bb_impl.cc @@ -27,8 +27,8 @@ conv_bit_corr_bb::sptr conv_bit_corr_bb::make(std::vector<unsigned long long> co int flush, float thresh) { - return gnuradio::get_initial_sptr( - new conv_bit_corr_bb_impl(correlator, corr_sym, corr_len, cut, flush, thresh)); + return gnuradio::make_block_sptr<conv_bit_corr_bb_impl>( + correlator, corr_sym, corr_len, cut, flush, thresh); } conv_bit_corr_bb_impl::conv_bit_corr_bb_impl(std::vector<unsigned long long> correlator, diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.cc b/gr-fec/lib/decode_ccsds_27_fb_impl.cc index 9df8f263fb..c13e6fc689 100644 --- a/gr-fec/lib/decode_ccsds_27_fb_impl.cc +++ b/gr-fec/lib/decode_ccsds_27_fb_impl.cc @@ -20,7 +20,7 @@ namespace fec { decode_ccsds_27_fb::sptr decode_ccsds_27_fb::make() { - return gnuradio::get_initial_sptr(new decode_ccsds_27_fb_impl()); + return gnuradio::make_block_sptr<decode_ccsds_27_fb_impl>(); } decode_ccsds_27_fb_impl::decode_ccsds_27_fb_impl() diff --git a/gr-fec/lib/decoder_impl.cc b/gr-fec/lib/decoder_impl.cc index bb4a654c0c..afaa980cd8 100644 --- a/gr-fec/lib/decoder_impl.cc +++ b/gr-fec/lib/decoder_impl.cc @@ -23,8 +23,8 @@ decoder::sptr decoder::make(generic_decoder::sptr my_decoder, size_t input_item_size, size_t output_item_size) { - return gnuradio::get_initial_sptr( - new decoder_impl(my_decoder, input_item_size, output_item_size)); + return gnuradio::make_block_sptr<decoder_impl>( + my_decoder, input_item_size, output_item_size); } decoder_impl::decoder_impl(generic_decoder::sptr my_decoder, diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc index d5a765f2a2..b0e17ea2bd 100644 --- a/gr-fec/lib/depuncture_bb_impl.cc +++ b/gr-fec/lib/depuncture_bb_impl.cc @@ -26,8 +26,8 @@ namespace fec { depuncture_bb::sptr depuncture_bb::make(int puncsize, int puncpat, int delay, uint8_t symbol) { - return gnuradio::get_initial_sptr( - new depuncture_bb_impl(puncsize, puncpat, delay, symbol)); + return gnuradio::make_block_sptr<depuncture_bb_impl>( + puncsize, puncpat, delay, symbol); } depuncture_bb_impl::depuncture_bb_impl(int puncsize, diff --git a/gr-fec/lib/encode_ccsds_27_bb_impl.cc b/gr-fec/lib/encode_ccsds_27_bb_impl.cc index 27644c1928..6e4d78546b 100644 --- a/gr-fec/lib/encode_ccsds_27_bb_impl.cc +++ b/gr-fec/lib/encode_ccsds_27_bb_impl.cc @@ -22,7 +22,7 @@ namespace fec { encode_ccsds_27_bb::sptr encode_ccsds_27_bb::make() { - return gnuradio::get_initial_sptr(new encode_ccsds_27_bb_impl()); + return gnuradio::make_block_sptr<encode_ccsds_27_bb_impl>(); } encode_ccsds_27_bb_impl::encode_ccsds_27_bb_impl() diff --git a/gr-fec/lib/encoder_impl.cc b/gr-fec/lib/encoder_impl.cc index 4fe2fd9b75..0501ca09a6 100644 --- a/gr-fec/lib/encoder_impl.cc +++ b/gr-fec/lib/encoder_impl.cc @@ -23,8 +23,8 @@ encoder::sptr encoder::make(generic_encoder::sptr my_encoder, size_t input_item_size, size_t output_item_size) { - return gnuradio::get_initial_sptr( - new encoder_impl(my_encoder, input_item_size, output_item_size)); + return gnuradio::make_block_sptr<encoder_impl>( + my_encoder, input_item_size, output_item_size); } encoder_impl::encoder_impl(generic_encoder::sptr my_encoder, diff --git a/gr-fec/lib/puncture_bb_impl.cc b/gr-fec/lib/puncture_bb_impl.cc index 49f1bcfb55..5ea14bb005 100644 --- a/gr-fec/lib/puncture_bb_impl.cc +++ b/gr-fec/lib/puncture_bb_impl.cc @@ -25,7 +25,7 @@ namespace fec { puncture_bb::sptr puncture_bb::make(int puncsize, int puncpat, int delay) { - return gnuradio::get_initial_sptr(new puncture_bb_impl(puncsize, puncpat, delay)); + return gnuradio::make_block_sptr<puncture_bb_impl>(puncsize, puncpat, delay); } puncture_bb_impl::puncture_bb_impl(int puncsize, int puncpat, int delay) diff --git a/gr-fec/lib/puncture_ff_impl.cc b/gr-fec/lib/puncture_ff_impl.cc index 4b8c74f014..03a76d1a4a 100644 --- a/gr-fec/lib/puncture_ff_impl.cc +++ b/gr-fec/lib/puncture_ff_impl.cc @@ -25,7 +25,7 @@ namespace fec { puncture_ff::sptr puncture_ff::make(int puncsize, int puncpat, int delay) { - return gnuradio::get_initial_sptr(new puncture_ff_impl(puncsize, puncpat, delay)); + return gnuradio::make_block_sptr<puncture_ff_impl>(puncsize, puncpat, delay); } puncture_ff_impl::puncture_ff_impl(int puncsize, int puncpat, int delay) diff --git a/gr-fec/lib/tagged_decoder_impl.cc b/gr-fec/lib/tagged_decoder_impl.cc index 06e96acebf..e06d55c0b2 100644 --- a/gr-fec/lib/tagged_decoder_impl.cc +++ b/gr-fec/lib/tagged_decoder_impl.cc @@ -25,8 +25,8 @@ tagged_decoder::sptr tagged_decoder::make(generic_decoder::sptr my_decoder, const std::string& lengthtagname, int mtu) { - return gnuradio::get_initial_sptr(new tagged_decoder_impl( - my_decoder, input_item_size, output_item_size, lengthtagname, mtu)); + return gnuradio::make_block_sptr<tagged_decoder_impl>( + my_decoder, input_item_size, output_item_size, lengthtagname, mtu); } tagged_decoder_impl::tagged_decoder_impl(generic_decoder::sptr my_decoder, diff --git a/gr-fec/lib/tagged_encoder_impl.cc b/gr-fec/lib/tagged_encoder_impl.cc index 11e39a730e..e3d0f3fad5 100644 --- a/gr-fec/lib/tagged_encoder_impl.cc +++ b/gr-fec/lib/tagged_encoder_impl.cc @@ -25,8 +25,8 @@ tagged_encoder::sptr tagged_encoder::make(generic_encoder::sptr my_encoder, const std::string& lengthtagname, int mtu) { - return gnuradio::get_initial_sptr(new tagged_encoder_impl( - my_encoder, input_item_size, output_item_size, lengthtagname, mtu)); + return gnuradio::make_block_sptr<tagged_encoder_impl>( + my_encoder, input_item_size, output_item_size, lengthtagname, mtu); } tagged_encoder_impl::tagged_encoder_impl(generic_encoder::sptr my_encoder, diff --git a/gr-fft/lib/ctrlport_probe_psd_impl.cc b/gr-fft/lib/ctrlport_probe_psd_impl.cc index f8a6c8f7f2..824d326cf5 100644 --- a/gr-fft/lib/ctrlport_probe_psd_impl.cc +++ b/gr-fft/lib/ctrlport_probe_psd_impl.cc @@ -21,7 +21,7 @@ namespace fft { ctrlport_probe_psd::sptr ctrlport_probe_psd::make(const std::string& id, const std::string& desc, int len) { - return gnuradio::get_initial_sptr(new ctrlport_probe_psd_impl(id, desc, len)); + return gnuradio::make_block_sptr<ctrlport_probe_psd_impl>(id, desc, len); } ctrlport_probe_psd_impl::ctrlport_probe_psd_impl(const std::string& id, diff --git a/gr-fft/lib/fft_vcc_fftw.cc b/gr-fft/lib/fft_vcc_fftw.cc index f659215dae..076d7a63fd 100644 --- a/gr-fft/lib/fft_vcc_fftw.cc +++ b/gr-fft/lib/fft_vcc_fftw.cc @@ -26,8 +26,8 @@ fft_vcc::sptr fft_vcc::make(int fft_size, bool shift, int nthreads) { - return gnuradio::get_initial_sptr( - new fft_vcc_fftw(fft_size, forward, window, shift, nthreads)); + return gnuradio::make_block_sptr<fft_vcc_fftw>( + fft_size, forward, window, shift, nthreads); } fft_vcc_fftw::fft_vcc_fftw(int fft_size, diff --git a/gr-fft/lib/fft_vfc_fftw.cc b/gr-fft/lib/fft_vfc_fftw.cc index 7bda58844f..77d5d9caf2 100644 --- a/gr-fft/lib/fft_vfc_fftw.cc +++ b/gr-fft/lib/fft_vfc_fftw.cc @@ -23,8 +23,7 @@ namespace fft { fft_vfc::sptr fft_vfc::make(int fft_size, bool forward, const std::vector<float>& window, int nthreads) { - return gnuradio::get_initial_sptr( - new fft_vfc_fftw(fft_size, forward, window, nthreads)); + return gnuradio::make_block_sptr<fft_vfc_fftw>(fft_size, forward, window, nthreads); } fft_vfc_fftw::fft_vfc_fftw(int fft_size, diff --git a/gr-fft/lib/goertzel_fc_impl.cc b/gr-fft/lib/goertzel_fc_impl.cc index e932ca0a55..b2c9508d08 100644 --- a/gr-fft/lib/goertzel_fc_impl.cc +++ b/gr-fft/lib/goertzel_fc_impl.cc @@ -20,7 +20,7 @@ namespace fft { goertzel_fc::sptr goertzel_fc::make(int rate, int len, float freq) { - return gnuradio::get_initial_sptr(new goertzel_fc_impl(rate, len, freq)); + return gnuradio::make_block_sptr<goertzel_fc_impl>(rate, len, freq); } goertzel_fc_impl::goertzel_fc_impl(int rate, int len, float freq) diff --git a/gr-filter/lib/dc_blocker_cc_impl.cc b/gr-filter/lib/dc_blocker_cc_impl.cc index 0b1ffd2570..11e3380a18 100644 --- a/gr-filter/lib/dc_blocker_cc_impl.cc +++ b/gr-filter/lib/dc_blocker_cc_impl.cc @@ -47,7 +47,7 @@ gr_complex moving_averager_c::filter(gr_complex x) dc_blocker_cc::sptr dc_blocker_cc::make(int D, bool long_form) { - return gnuradio::get_initial_sptr(new dc_blocker_cc_impl(D, long_form)); + return gnuradio::make_block_sptr<dc_blocker_cc_impl>(D, long_form); } diff --git a/gr-filter/lib/dc_blocker_ff_impl.cc b/gr-filter/lib/dc_blocker_ff_impl.cc index b8cd55aeaf..51d1421144 100644 --- a/gr-filter/lib/dc_blocker_ff_impl.cc +++ b/gr-filter/lib/dc_blocker_ff_impl.cc @@ -43,7 +43,7 @@ float moving_averager_f::filter(float x) dc_blocker_ff::sptr dc_blocker_ff::make(int D, bool long_form) { - return gnuradio::get_initial_sptr(new dc_blocker_ff_impl(D, long_form)); + return gnuradio::make_block_sptr<dc_blocker_ff_impl>(D, long_form); } dc_blocker_ff_impl::dc_blocker_ff_impl(int D, bool long_form) diff --git a/gr-filter/lib/fft_filter_ccc_impl.cc b/gr-filter/lib/fft_filter_ccc_impl.cc index 4c305e54bf..acf4dff66d 100644 --- a/gr-filter/lib/fft_filter_ccc_impl.cc +++ b/gr-filter/lib/fft_filter_ccc_impl.cc @@ -25,8 +25,7 @@ namespace filter { fft_filter_ccc::sptr fft_filter_ccc::make(int decimation, const std::vector<gr_complex>& taps, int nthreads) { - return gnuradio::get_initial_sptr( - new fft_filter_ccc_impl(decimation, taps, nthreads)); + return gnuradio::make_block_sptr<fft_filter_ccc_impl>(decimation, taps, nthreads); } fft_filter_ccc_impl::fft_filter_ccc_impl(int decimation, diff --git a/gr-filter/lib/fft_filter_ccf_impl.cc b/gr-filter/lib/fft_filter_ccf_impl.cc index 8a99dae692..56bdf68953 100644 --- a/gr-filter/lib/fft_filter_ccf_impl.cc +++ b/gr-filter/lib/fft_filter_ccf_impl.cc @@ -25,8 +25,7 @@ namespace filter { fft_filter_ccf::sptr fft_filter_ccf::make(int decimation, const std::vector<float>& taps, int nthreads) { - return gnuradio::get_initial_sptr( - new fft_filter_ccf_impl(decimation, taps, nthreads)); + return gnuradio::make_block_sptr<fft_filter_ccf_impl>(decimation, taps, nthreads); } fft_filter_ccf_impl::fft_filter_ccf_impl(int decimation, diff --git a/gr-filter/lib/fft_filter_fff_impl.cc b/gr-filter/lib/fft_filter_fff_impl.cc index 7bbd8d202e..d72318ffce 100644 --- a/gr-filter/lib/fft_filter_fff_impl.cc +++ b/gr-filter/lib/fft_filter_fff_impl.cc @@ -25,8 +25,7 @@ namespace filter { fft_filter_fff::sptr fft_filter_fff::make(int decimation, const std::vector<float>& taps, int nthreads) { - return gnuradio::get_initial_sptr( - new fft_filter_fff_impl(decimation, taps, nthreads)); + return gnuradio::make_block_sptr<fft_filter_fff_impl>(decimation, taps, nthreads); } diff --git a/gr-filter/lib/filter_delay_fc_impl.cc b/gr-filter/lib/filter_delay_fc_impl.cc index 32d317c882..a3e3c5e8df 100644 --- a/gr-filter/lib/filter_delay_fc_impl.cc +++ b/gr-filter/lib/filter_delay_fc_impl.cc @@ -20,7 +20,7 @@ namespace filter { filter_delay_fc::sptr filter_delay_fc::make(const std::vector<float>& taps) { - return gnuradio::get_initial_sptr(new filter_delay_fc_impl(taps)); + return gnuradio::make_block_sptr<filter_delay_fc_impl>(taps); } filter_delay_fc_impl::filter_delay_fc_impl(const std::vector<float>& taps) diff --git a/gr-filter/lib/filterbank_vcvcf_impl.cc b/gr-filter/lib/filterbank_vcvcf_impl.cc index db1c06db66..a532ba68b0 100644 --- a/gr-filter/lib/filterbank_vcvcf_impl.cc +++ b/gr-filter/lib/filterbank_vcvcf_impl.cc @@ -22,7 +22,7 @@ namespace filter { filterbank_vcvcf::sptr filterbank_vcvcf::make(const std::vector<std::vector<float>>& taps) { - return gnuradio::get_initial_sptr(new filterbank_vcvcf_impl(taps)); + return gnuradio::make_block_sptr<filterbank_vcvcf_impl>(taps); } filterbank_vcvcf_impl::filterbank_vcvcf_impl(const std::vector<std::vector<float>>& taps) diff --git a/gr-filter/lib/fir_filter_blk_impl.cc b/gr-filter/lib/fir_filter_blk_impl.cc index da41d46b0f..0885766161 100644 --- a/gr-filter/lib/fir_filter_blk_impl.cc +++ b/gr-filter/lib/fir_filter_blk_impl.cc @@ -23,8 +23,8 @@ template <class IN_T, class OUT_T, class TAP_T> typename fir_filter_blk<IN_T, OUT_T, TAP_T>::sptr fir_filter_blk<IN_T, OUT_T, TAP_T>::make(int decimation, const std::vector<TAP_T>& taps) { - return gnuradio::get_initial_sptr( - new fir_filter_blk_impl<IN_T, OUT_T, TAP_T>(decimation, taps)); + return gnuradio::make_block_sptr<fir_filter_blk_impl<IN_T, OUT_T, TAP_T>>(decimation, + taps); } diff --git a/gr-filter/lib/freq_xlating_fir_filter_impl.cc b/gr-filter/lib/freq_xlating_fir_filter_impl.cc index dfbfb319d0..57f83ffb58 100644 --- a/gr-filter/lib/freq_xlating_fir_filter_impl.cc +++ b/gr-filter/lib/freq_xlating_fir_filter_impl.cc @@ -27,9 +27,8 @@ freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>::make(int decimation, double center_freq, double sampling_freq) { - return gnuradio::get_initial_sptr( - new freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>( - decimation, taps, center_freq, sampling_freq)); + return gnuradio::make_block_sptr<freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>>( + decimation, taps, center_freq, sampling_freq); } template <class IN_T, class OUT_T, class TAP_T> diff --git a/gr-filter/lib/hilbert_fc_impl.cc b/gr-filter/lib/hilbert_fc_impl.cc index 73e4b2e51f..9433970f03 100644 --- a/gr-filter/lib/hilbert_fc_impl.cc +++ b/gr-filter/lib/hilbert_fc_impl.cc @@ -22,7 +22,7 @@ namespace filter { hilbert_fc::sptr hilbert_fc::make(unsigned int ntaps, firdes::win_type window, double beta) { - return gnuradio::get_initial_sptr(new hilbert_fc_impl(ntaps, window, beta)); + return gnuradio::make_block_sptr<hilbert_fc_impl>(ntaps, window, beta); } hilbert_fc_impl::hilbert_fc_impl(unsigned int ntaps, firdes::win_type window, double beta) diff --git a/gr-filter/lib/iir_filter_ccc_impl.cc b/gr-filter/lib/iir_filter_ccc_impl.cc index 204b782d96..3bb3cb9826 100644 --- a/gr-filter/lib/iir_filter_ccc_impl.cc +++ b/gr-filter/lib/iir_filter_ccc_impl.cc @@ -22,7 +22,7 @@ iir_filter_ccc::sptr iir_filter_ccc::make(const std::vector<gr_complex>& fftaps, const std::vector<gr_complex>& fbtaps, bool oldstyle) { - return gnuradio::get_initial_sptr(new iir_filter_ccc_impl(fftaps, fbtaps, oldstyle)); + return gnuradio::make_block_sptr<iir_filter_ccc_impl>(fftaps, fbtaps, oldstyle); } iir_filter_ccc_impl::iir_filter_ccc_impl(const std::vector<gr_complex>& fftaps, diff --git a/gr-filter/lib/iir_filter_ccd_impl.cc b/gr-filter/lib/iir_filter_ccd_impl.cc index 30b6211a9a..847316fe0e 100644 --- a/gr-filter/lib/iir_filter_ccd_impl.cc +++ b/gr-filter/lib/iir_filter_ccd_impl.cc @@ -22,7 +22,7 @@ iir_filter_ccd::sptr iir_filter_ccd::make(const std::vector<double>& fftaps, const std::vector<double>& fbtaps, bool oldstyle) { - return gnuradio::get_initial_sptr(new iir_filter_ccd_impl(fftaps, fbtaps, oldstyle)); + return gnuradio::make_block_sptr<iir_filter_ccd_impl>(fftaps, fbtaps, oldstyle); } iir_filter_ccd_impl::iir_filter_ccd_impl(const std::vector<double>& fftaps, diff --git a/gr-filter/lib/iir_filter_ccf_impl.cc b/gr-filter/lib/iir_filter_ccf_impl.cc index d3125148c7..2584065b3c 100644 --- a/gr-filter/lib/iir_filter_ccf_impl.cc +++ b/gr-filter/lib/iir_filter_ccf_impl.cc @@ -22,7 +22,7 @@ iir_filter_ccf::sptr iir_filter_ccf::make(const std::vector<float>& fftaps, const std::vector<float>& fbtaps, bool oldstyle) { - return gnuradio::get_initial_sptr(new iir_filter_ccf_impl(fftaps, fbtaps, oldstyle)); + return gnuradio::make_block_sptr<iir_filter_ccf_impl>(fftaps, fbtaps, oldstyle); } iir_filter_ccf_impl::iir_filter_ccf_impl(const std::vector<float>& fftaps, diff --git a/gr-filter/lib/iir_filter_ccz_impl.cc b/gr-filter/lib/iir_filter_ccz_impl.cc index 9423990822..1e6e48ef06 100644 --- a/gr-filter/lib/iir_filter_ccz_impl.cc +++ b/gr-filter/lib/iir_filter_ccz_impl.cc @@ -22,7 +22,7 @@ iir_filter_ccz::sptr iir_filter_ccz::make(const std::vector<gr_complexd>& fftaps const std::vector<gr_complexd>& fbtaps, bool oldstyle) { - return gnuradio::get_initial_sptr(new iir_filter_ccz_impl(fftaps, fbtaps, oldstyle)); + return gnuradio::make_block_sptr<iir_filter_ccz_impl>(fftaps, fbtaps, oldstyle); } iir_filter_ccz_impl::iir_filter_ccz_impl(const std::vector<gr_complexd>& fftaps, diff --git a/gr-filter/lib/iir_filter_ffd_impl.cc b/gr-filter/lib/iir_filter_ffd_impl.cc index 99d8eb8c76..8211902d3c 100644 --- a/gr-filter/lib/iir_filter_ffd_impl.cc +++ b/gr-filter/lib/iir_filter_ffd_impl.cc @@ -22,7 +22,7 @@ iir_filter_ffd::sptr iir_filter_ffd::make(const std::vector<double>& fftaps, const std::vector<double>& fbtaps, bool oldstyle) { - return gnuradio::get_initial_sptr(new iir_filter_ffd_impl(fftaps, fbtaps, oldstyle)); + return gnuradio::make_block_sptr<iir_filter_ffd_impl>(fftaps, fbtaps, oldstyle); } iir_filter_ffd_impl::iir_filter_ffd_impl(const std::vector<double>& fftaps, diff --git a/gr-filter/lib/interp_fir_filter_impl.cc b/gr-filter/lib/interp_fir_filter_impl.cc index 9a54ab3667..0b7e47a40f 100644 --- a/gr-filter/lib/interp_fir_filter_impl.cc +++ b/gr-filter/lib/interp_fir_filter_impl.cc @@ -25,8 +25,8 @@ typename interp_fir_filter<IN_T, OUT_T, TAP_T>::sptr interp_fir_filter<IN_T, OUT_T, TAP_T>::make(unsigned interpolation, const std::vector<TAP_T>& taps) { - return gnuradio::get_initial_sptr( - new interp_fir_filter_impl<IN_T, OUT_T, TAP_T>(interpolation, taps)); + return gnuradio::make_block_sptr<interp_fir_filter_impl<IN_T, OUT_T, TAP_T>>( + interpolation, taps); } template <class IN_T, class OUT_T, class TAP_T> diff --git a/gr-filter/lib/ival_decimator_impl.cc b/gr-filter/lib/ival_decimator_impl.cc index 5501383b8e..c7f438ea0d 100644 --- a/gr-filter/lib/ival_decimator_impl.cc +++ b/gr-filter/lib/ival_decimator_impl.cc @@ -21,7 +21,7 @@ namespace filter { ival_decimator::sptr ival_decimator::make(int decimation, int data_size) { - return gnuradio::get_initial_sptr(new ival_decimator_impl(decimation, data_size)); + return gnuradio::make_block_sptr<ival_decimator_impl>(decimation, data_size); } /* diff --git a/gr-filter/lib/mmse_interpolator_cc_impl.cc b/gr-filter/lib/mmse_interpolator_cc_impl.cc index 94074af2d3..a442044e6e 100644 --- a/gr-filter/lib/mmse_interpolator_cc_impl.cc +++ b/gr-filter/lib/mmse_interpolator_cc_impl.cc @@ -22,8 +22,8 @@ namespace filter { mmse_interpolator_cc::sptr mmse_interpolator_cc::make(float phase_shift, float interp_ratio) { - return gnuradio::get_initial_sptr( - new mmse_interpolator_cc_impl(phase_shift, interp_ratio)); + return gnuradio::make_block_sptr<mmse_interpolator_cc_impl>(phase_shift, + interp_ratio); } mmse_interpolator_cc_impl::mmse_interpolator_cc_impl(float phase_shift, diff --git a/gr-filter/lib/mmse_interpolator_ff_impl.cc b/gr-filter/lib/mmse_interpolator_ff_impl.cc index 1b40ad7a15..b1b3c36543 100644 --- a/gr-filter/lib/mmse_interpolator_ff_impl.cc +++ b/gr-filter/lib/mmse_interpolator_ff_impl.cc @@ -22,8 +22,8 @@ namespace filter { mmse_interpolator_ff::sptr mmse_interpolator_ff::make(float phase_shift, float interp_ratio) { - return gnuradio::get_initial_sptr( - new mmse_interpolator_ff_impl(phase_shift, interp_ratio)); + return gnuradio::make_block_sptr<mmse_interpolator_ff_impl>(phase_shift, + interp_ratio); } mmse_interpolator_ff_impl::mmse_interpolator_ff_impl(float phase_shift, diff --git a/gr-filter/lib/mmse_resampler_cc_impl.cc b/gr-filter/lib/mmse_resampler_cc_impl.cc index 939aadf8fd..edf20b2b93 100644 --- a/gr-filter/lib/mmse_resampler_cc_impl.cc +++ b/gr-filter/lib/mmse_resampler_cc_impl.cc @@ -21,8 +21,7 @@ namespace filter { mmse_resampler_cc::sptr mmse_resampler_cc::make(float phase_shift, float resamp_ratio) { - return gnuradio::get_initial_sptr( - new mmse_resampler_cc_impl(phase_shift, resamp_ratio)); + return gnuradio::make_block_sptr<mmse_resampler_cc_impl>(phase_shift, resamp_ratio); } mmse_resampler_cc_impl::mmse_resampler_cc_impl(float phase_shift, float resamp_ratio) diff --git a/gr-filter/lib/mmse_resampler_ff_impl.cc b/gr-filter/lib/mmse_resampler_ff_impl.cc index 6a59b3c8bf..894bf368c2 100644 --- a/gr-filter/lib/mmse_resampler_ff_impl.cc +++ b/gr-filter/lib/mmse_resampler_ff_impl.cc @@ -21,8 +21,7 @@ namespace filter { mmse_resampler_ff::sptr mmse_resampler_ff::make(float phase_shift, float resamp_ratio) { - return gnuradio::get_initial_sptr( - new mmse_resampler_ff_impl(phase_shift, resamp_ratio)); + return gnuradio::make_block_sptr<mmse_resampler_ff_impl>(phase_shift, resamp_ratio); } mmse_resampler_ff_impl::mmse_resampler_ff_impl(float phase_shift, float resamp_ratio) diff --git a/gr-filter/lib/pfb_arb_resampler_ccc_impl.cc b/gr-filter/lib/pfb_arb_resampler_ccc_impl.cc index 1a0760a37a..cd77eee1a9 100644 --- a/gr-filter/lib/pfb_arb_resampler_ccc_impl.cc +++ b/gr-filter/lib/pfb_arb_resampler_ccc_impl.cc @@ -22,8 +22,7 @@ namespace filter { pfb_arb_resampler_ccc::sptr pfb_arb_resampler_ccc::make( float rate, const std::vector<gr_complex>& taps, unsigned int filter_size) { - return gnuradio::get_initial_sptr( - new pfb_arb_resampler_ccc_impl(rate, taps, filter_size)); + return gnuradio::make_block_sptr<pfb_arb_resampler_ccc_impl>(rate, taps, filter_size); } diff --git a/gr-filter/lib/pfb_arb_resampler_ccf_impl.cc b/gr-filter/lib/pfb_arb_resampler_ccf_impl.cc index d56ed01680..94a7a75796 100644 --- a/gr-filter/lib/pfb_arb_resampler_ccf_impl.cc +++ b/gr-filter/lib/pfb_arb_resampler_ccf_impl.cc @@ -23,8 +23,7 @@ pfb_arb_resampler_ccf::sptr pfb_arb_resampler_ccf::make(float rate, const std::vector<float>& taps, unsigned int filter_size) { - return gnuradio::get_initial_sptr( - new pfb_arb_resampler_ccf_impl(rate, taps, filter_size)); + return gnuradio::make_block_sptr<pfb_arb_resampler_ccf_impl>(rate, taps, filter_size); } diff --git a/gr-filter/lib/pfb_arb_resampler_fff_impl.cc b/gr-filter/lib/pfb_arb_resampler_fff_impl.cc index 49a8188c72..09d6783a9d 100644 --- a/gr-filter/lib/pfb_arb_resampler_fff_impl.cc +++ b/gr-filter/lib/pfb_arb_resampler_fff_impl.cc @@ -23,8 +23,7 @@ pfb_arb_resampler_fff::sptr pfb_arb_resampler_fff::make(float rate, const std::vector<float>& taps, unsigned int filter_size) { - return gnuradio::get_initial_sptr( - new pfb_arb_resampler_fff_impl(rate, taps, filter_size)); + return gnuradio::make_block_sptr<pfb_arb_resampler_fff_impl>(rate, taps, filter_size); } diff --git a/gr-filter/lib/pfb_channelizer_ccf_impl.cc b/gr-filter/lib/pfb_channelizer_ccf_impl.cc index 514ea629a1..7aa9493323 100644 --- a/gr-filter/lib/pfb_channelizer_ccf_impl.cc +++ b/gr-filter/lib/pfb_channelizer_ccf_impl.cc @@ -27,8 +27,8 @@ pfb_channelizer_ccf::sptr pfb_channelizer_ccf::make(unsigned int nfilts, const std::vector<float>& taps, float oversample_rate) { - return gnuradio::get_initial_sptr( - new pfb_channelizer_ccf_impl(nfilts, taps, oversample_rate)); + return gnuradio::make_block_sptr<pfb_channelizer_ccf_impl>( + nfilts, taps, oversample_rate); } pfb_channelizer_ccf_impl::pfb_channelizer_ccf_impl(unsigned int nfilts, diff --git a/gr-filter/lib/pfb_decimator_ccf_impl.cc b/gr-filter/lib/pfb_decimator_ccf_impl.cc index fcb5da24ae..e96d3d7067 100644 --- a/gr-filter/lib/pfb_decimator_ccf_impl.cc +++ b/gr-filter/lib/pfb_decimator_ccf_impl.cc @@ -27,8 +27,8 @@ pfb_decimator_ccf::sptr pfb_decimator_ccf::make(unsigned int decim, bool use_fft_rotator, bool use_fft_filters) { - return gnuradio::get_initial_sptr(new pfb_decimator_ccf_impl( - decim, taps, channel, use_fft_rotator, use_fft_filters)); + return gnuradio::make_block_sptr<pfb_decimator_ccf_impl>( + decim, taps, channel, use_fft_rotator, use_fft_filters); } pfb_decimator_ccf_impl::pfb_decimator_ccf_impl(unsigned int decim, diff --git a/gr-filter/lib/pfb_interpolator_ccf_impl.cc b/gr-filter/lib/pfb_interpolator_ccf_impl.cc index 197742a604..9a77c783e7 100644 --- a/gr-filter/lib/pfb_interpolator_ccf_impl.cc +++ b/gr-filter/lib/pfb_interpolator_ccf_impl.cc @@ -21,7 +21,7 @@ namespace filter { pfb_interpolator_ccf::sptr pfb_interpolator_ccf::make(unsigned int interp, const std::vector<float>& taps) { - return gnuradio::get_initial_sptr(new pfb_interpolator_ccf_impl(interp, taps)); + return gnuradio::make_block_sptr<pfb_interpolator_ccf_impl>(interp, taps); } diff --git a/gr-filter/lib/pfb_synthesizer_ccf_impl.cc b/gr-filter/lib/pfb_synthesizer_ccf_impl.cc index aebd782c8b..d33ee84e6e 100644 --- a/gr-filter/lib/pfb_synthesizer_ccf_impl.cc +++ b/gr-filter/lib/pfb_synthesizer_ccf_impl.cc @@ -24,7 +24,7 @@ pfb_synthesizer_ccf::sptr pfb_synthesizer_ccf::make(unsigned int numchans, const std::vector<float>& taps, bool twox) { - return gnuradio::get_initial_sptr(new pfb_synthesizer_ccf_impl(numchans, taps, twox)); + return gnuradio::make_block_sptr<pfb_synthesizer_ccf_impl>(numchans, taps, twox); } pfb_synthesizer_ccf_impl::pfb_synthesizer_ccf_impl(unsigned int numchans, diff --git a/gr-filter/lib/rational_resampler_base_impl.cc b/gr-filter/lib/rational_resampler_base_impl.cc index 06b5f50644..1bfb095336 100644 --- a/gr-filter/lib/rational_resampler_base_impl.cc +++ b/gr-filter/lib/rational_resampler_base_impl.cc @@ -26,9 +26,8 @@ rational_resampler_base<IN_T, OUT_T, TAP_T>::make(unsigned interpolation, unsigned decimation, const std::vector<TAP_T>& taps) { - return gnuradio::get_initial_sptr( - new rational_resampler_base_impl<IN_T, OUT_T, TAP_T>( - interpolation, decimation, taps)); + return gnuradio::make_block_sptr<rational_resampler_base_impl<IN_T, OUT_T, TAP_T>>( + interpolation, decimation, taps); } template <class IN_T, class OUT_T, class TAP_T> diff --git a/gr-filter/lib/single_pole_iir_filter_cc_impl.cc b/gr-filter/lib/single_pole_iir_filter_cc_impl.cc index 4be0bd287c..3c75adf752 100644 --- a/gr-filter/lib/single_pole_iir_filter_cc_impl.cc +++ b/gr-filter/lib/single_pole_iir_filter_cc_impl.cc @@ -22,7 +22,7 @@ namespace filter { single_pole_iir_filter_cc::sptr single_pole_iir_filter_cc::make(double alpha, unsigned int vlen) { - return gnuradio::get_initial_sptr(new single_pole_iir_filter_cc_impl(alpha, vlen)); + return gnuradio::make_block_sptr<single_pole_iir_filter_cc_impl>(alpha, vlen); } single_pole_iir_filter_cc_impl::single_pole_iir_filter_cc_impl(double alpha, diff --git a/gr-filter/lib/single_pole_iir_filter_ff_impl.cc b/gr-filter/lib/single_pole_iir_filter_ff_impl.cc index b6c336ac4a..80bd02f911 100644 --- a/gr-filter/lib/single_pole_iir_filter_ff_impl.cc +++ b/gr-filter/lib/single_pole_iir_filter_ff_impl.cc @@ -21,7 +21,7 @@ namespace filter { single_pole_iir_filter_ff::sptr single_pole_iir_filter_ff::make(double alpha, unsigned int vlen) { - return gnuradio::get_initial_sptr(new single_pole_iir_filter_ff_impl(alpha, vlen)); + return gnuradio::make_block_sptr<single_pole_iir_filter_ff_impl>(alpha, vlen); } single_pole_iir_filter_ff_impl::single_pole_iir_filter_ff_impl(double alpha, diff --git a/gr-network/lib/tcp_sink_impl.cc b/gr-network/lib/tcp_sink_impl.cc index 3726f510b1..0c596d1d3c 100644 --- a/gr-network/lib/tcp_sink_impl.cc +++ b/gr-network/lib/tcp_sink_impl.cc @@ -23,8 +23,8 @@ namespace network { tcp_sink::sptr tcp_sink::make( size_t itemsize, size_t veclen, const std::string& host, int port, int sinkmode) { - return gnuradio::get_initial_sptr( - new tcp_sink_impl(itemsize, veclen, host, port, sinkmode)); + return gnuradio::make_block_sptr<tcp_sink_impl>( + itemsize, veclen, host, port, sinkmode); } /* diff --git a/gr-network/lib/udp_sink_impl.cc b/gr-network/lib/udp_sink_impl.cc index 5c2f3d1a75..7dce7625e5 100644 --- a/gr-network/lib/udp_sink_impl.cc +++ b/gr-network/lib/udp_sink_impl.cc @@ -27,8 +27,8 @@ udp_sink::sptr udp_sink::make(size_t itemsize, int payloadsize, bool send_eof) { - return gnuradio::get_initial_sptr(new udp_sink_impl( - itemsize, veclen, host, port, header_type, payloadsize, send_eof)); + return gnuradio::make_block_sptr<udp_sink_impl>( + itemsize, veclen, host, port, header_type, payloadsize, send_eof); } /* diff --git a/gr-network/lib/udp_source_impl.cc b/gr-network/lib/udp_source_impl.cc index 4758b9e219..3b89e87bea 100644 --- a/gr-network/lib/udp_source_impl.cc +++ b/gr-network/lib/udp_source_impl.cc @@ -28,14 +28,14 @@ udp_source::sptr udp_source::make(size_t itemsize, bool source_zeros, bool ipv6) { - return gnuradio::get_initial_sptr(new udp_source_impl(itemsize, - veclen, - port, - header_type, - payloadsize, - notify_missed, - source_zeros, - ipv6)); + return gnuradio::make_block_sptr<udp_source_impl>(itemsize, + veclen, + port, + header_type, + payloadsize, + notify_missed, + source_zeros, + ipv6); } /* diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc index f032f6ce26..0740858c66 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.cc +++ b/gr-qtgui/lib/ber_sink_b_impl.cc @@ -30,8 +30,8 @@ ber_sink_b::sptr ber_sink_b::make(std::vector<float> esnos, std::vector<std::string> curvenames, QWidget* parent) { - return gnuradio::get_initial_sptr(new ber_sink_b_impl( - esnos, curves, ber_min_errors, ber_limit, curvenames, parent)); + return gnuradio::make_block_sptr<ber_sink_b_impl>( + esnos, curves, ber_min_errors, ber_limit, curvenames, parent); } ber_sink_b_impl::ber_sink_b_impl(std::vector<float> esnos, diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index a9dfe70d17..622a328242 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -26,8 +26,7 @@ namespace qtgui { const_sink_c::sptr const_sink_c::make(int size, const std::string& name, int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new const_sink_c_impl(size, name, nconnections, parent)); + return gnuradio::make_block_sptr<const_sink_c_impl>(size, name, nconnections, parent); } const_sink_c_impl::const_sink_c_impl(int size, diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc index 8f33adb322..bb1b069857 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.cc +++ b/gr-qtgui/lib/edit_box_msg_impl.cc @@ -30,8 +30,8 @@ edit_box_msg::sptr edit_box_msg::make(data_type_t type, const std::string& key, QWidget* parent) { - return gnuradio::get_initial_sptr( - new edit_box_msg_impl(type, value, label, is_pair, is_static, key, parent)); + return gnuradio::make_block_sptr<edit_box_msg_impl>( + type, value, label, is_pair, is_static, key, parent); } edit_box_msg_impl::edit_box_msg_impl(data_type_t type, diff --git a/gr-qtgui/lib/eye_sink_c_impl.cc b/gr-qtgui/lib/eye_sink_c_impl.cc index 7a3f1646d2..662f5a2bc5 100644 --- a/gr-qtgui/lib/eye_sink_c_impl.cc +++ b/gr-qtgui/lib/eye_sink_c_impl.cc @@ -33,8 +33,8 @@ eye_sink_c::sptr eye_sink_c::make(int size, unsigned int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new eye_sink_c_impl(size, samp_rate, name, nconnections, parent)); + return gnuradio::make_block_sptr<eye_sink_c_impl>( + size, samp_rate, name, nconnections, parent); } eye_sink_c_impl::eye_sink_c_impl(int size, diff --git a/gr-qtgui/lib/eye_sink_f_impl.cc b/gr-qtgui/lib/eye_sink_f_impl.cc index 7e3efccb0e..ed7fea983a 100644 --- a/gr-qtgui/lib/eye_sink_f_impl.cc +++ b/gr-qtgui/lib/eye_sink_f_impl.cc @@ -33,8 +33,8 @@ eye_sink_f::sptr eye_sink_f::make(int size, unsigned int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new eye_sink_f_impl(size, samp_rate, name, nconnections, parent)); + return gnuradio::make_block_sptr<eye_sink_f_impl>( + size, samp_rate, name, nconnections, parent); } eye_sink_f_impl::eye_sink_f_impl(int size, diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index 63490e72ac..f3cb9eb00e 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -34,8 +34,8 @@ freq_sink_c::sptr freq_sink_c::make(int fftsize, int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new freq_sink_c_impl(fftsize, wintype, fc, bw, name, nconnections, parent)); + return gnuradio::make_block_sptr<freq_sink_c_impl>( + fftsize, wintype, fc, bw, name, nconnections, parent); } freq_sink_c_impl::freq_sink_c_impl(int fftsize, diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index 0622fa2577..2dfafb71b8 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -34,8 +34,8 @@ freq_sink_f::sptr freq_sink_f::make(int fftsize, int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new freq_sink_f_impl(fftsize, wintype, fc, bw, name, nconnections, parent)); + return gnuradio::make_block_sptr<freq_sink_f_impl>( + fftsize, wintype, fc, bw, name, nconnections, parent); } freq_sink_f_impl::freq_sink_f_impl(int fftsize, diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc index 06280b8397..dbef86ee7a 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -33,8 +33,8 @@ histogram_sink_f::sptr histogram_sink_f::make(int size, int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new histogram_sink_f_impl(size, bins, xmin, xmax, name, nconnections, parent)); + return gnuradio::make_block_sptr<histogram_sink_f_impl>( + size, bins, xmin, xmax, name, nconnections, parent); } histogram_sink_f_impl::histogram_sink_f_impl(int size, diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc index 567fd1c3da..81611f5fb8 100644 --- a/gr-qtgui/lib/number_sink_impl.cc +++ b/gr-qtgui/lib/number_sink_impl.cc @@ -38,8 +38,8 @@ namespace qtgui { number_sink::sptr number_sink::make( size_t itemsize, float average, graph_t graph_type, int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new number_sink_impl(itemsize, average, graph_type, nconnections, parent)); + return gnuradio::make_block_sptr<number_sink_impl>( + itemsize, average, graph_type, nconnections, parent); } number_sink_impl::number_sink_impl( diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index 567f369e7e..39bd74aa3e 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -35,16 +35,16 @@ sink_c::sptr sink_c::make(int fftsize, bool plotconst, QWidget* parent) { - return gnuradio::get_initial_sptr(new sink_c_impl(fftsize, - wintype, - fc, - bw, - name, - plotfreq, - plotwaterfall, - plottime, - plotconst, - parent)); + return gnuradio::make_block_sptr<sink_c_impl>(fftsize, + wintype, + fc, + bw, + name, + plotfreq, + plotwaterfall, + plottime, + plotconst, + parent); } sink_c_impl::sink_c_impl(int fftsize, diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc index c7fb5d39f2..acaf4b4e09 100644 --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -35,16 +35,16 @@ sink_f::sptr sink_f::make(int fftsize, bool plotconst, QWidget* parent) { - return gnuradio::get_initial_sptr(new sink_f_impl(fftsize, - wintype, - fc, - bw, - name, - plotfreq, - plotwaterfall, - plottime, - plotconst, - parent)); + return gnuradio::make_block_sptr<sink_f_impl>(fftsize, + wintype, + fc, + bw, + name, + plotfreq, + plotwaterfall, + plottime, + plotconst, + parent); } sink_f_impl::sink_f_impl(int fftsize, diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index ddc5809111..bf2812fd97 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -33,8 +33,8 @@ time_raster_sink_b::sptr time_raster_sink_b::make(double samp_rate, int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr(new time_raster_sink_b_impl( - samp_rate, rows, cols, mult, offset, name, nconnections, parent)); + return gnuradio::make_block_sptr<time_raster_sink_b_impl>( + samp_rate, rows, cols, mult, offset, name, nconnections, parent); } time_raster_sink_b_impl::time_raster_sink_b_impl(double samp_rate, diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index 494860e37c..fd18413948 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -33,8 +33,8 @@ time_raster_sink_f::sptr time_raster_sink_f::make(double samp_rate, int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr(new time_raster_sink_f_impl( - samp_rate, rows, cols, mult, offset, name, nconnections, parent)); + return gnuradio::make_block_sptr<time_raster_sink_f_impl>( + samp_rate, rows, cols, mult, offset, name, nconnections, parent); } time_raster_sink_f_impl::time_raster_sink_f_impl(double samp_rate, diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index 31e583583c..bea9f4d123 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -33,8 +33,8 @@ time_sink_c::sptr time_sink_c::make(int size, unsigned int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new time_sink_c_impl(size, samp_rate, name, nconnections, parent)); + return gnuradio::make_block_sptr<time_sink_c_impl>( + size, samp_rate, name, nconnections, parent); } time_sink_c_impl::time_sink_c_impl(int size, diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 408c14c93b..f05166490e 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -34,8 +34,8 @@ time_sink_f::sptr time_sink_f::make(int size, unsigned int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new time_sink_f_impl(size, samp_rate, name, nconnections, parent)); + return gnuradio::make_block_sptr<time_sink_f_impl>( + size, samp_rate, name, nconnections, parent); } time_sink_f_impl::time_sink_f_impl(int size, diff --git a/gr-qtgui/lib/vector_sink_f_impl.cc b/gr-qtgui/lib/vector_sink_f_impl.cc index ca3c41e4ba..8babe5f5bf 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.cc +++ b/gr-qtgui/lib/vector_sink_f_impl.cc @@ -36,8 +36,8 @@ vector_sink_f::sptr vector_sink_f::make(unsigned int vlen, int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr(new vector_sink_f_impl( - vlen, x_start, x_step, x_axis_label, y_axis_label, name, nconnections, parent)); + return gnuradio::make_block_sptr<vector_sink_f_impl>( + vlen, x_start, x_step, x_axis_label, y_axis_label, name, nconnections, parent); } vector_sink_f_impl::vector_sink_f_impl(unsigned int vlen, diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index 7ca1e62137..93ef5af275 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -35,8 +35,8 @@ waterfall_sink_c::sptr waterfall_sink_c::make(int fftsize, int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new waterfall_sink_c_impl(fftsize, wintype, fc, bw, name, nconnections, parent)); + return gnuradio::make_block_sptr<waterfall_sink_c_impl>( + fftsize, wintype, fc, bw, name, nconnections, parent); } waterfall_sink_c_impl::waterfall_sink_c_impl(int fftsize, diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index d101a97f57..66e265d62d 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -33,8 +33,8 @@ waterfall_sink_f::sptr waterfall_sink_f::make(int fftsize, int nconnections, QWidget* parent) { - return gnuradio::get_initial_sptr( - new waterfall_sink_f_impl(fftsize, wintype, fc, bw, name, nconnections, parent)); + return gnuradio::make_block_sptr<waterfall_sink_f_impl>( + fftsize, wintype, fc, bw, name, nconnections, parent); } waterfall_sink_f_impl::waterfall_sink_f_impl(int fftsize, diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.cc b/gr-trellis/lib/constellation_metrics_cf_impl.cc index f580a5a3e6..14c4ce5ff8 100644 --- a/gr-trellis/lib/constellation_metrics_cf_impl.cc +++ b/gr-trellis/lib/constellation_metrics_cf_impl.cc @@ -25,8 +25,7 @@ constellation_metrics_cf::sptr constellation_metrics_cf::make(digital::constellation_sptr constellation, digital::trellis_metric_type_t TYPE) { - return gnuradio::get_initial_sptr( - new constellation_metrics_cf_impl(constellation, TYPE)); + return gnuradio::make_block_sptr<constellation_metrics_cf_impl>(constellation, TYPE); } constellation_metrics_cf_impl::constellation_metrics_cf_impl( diff --git a/gr-trellis/lib/encoder_impl.cc b/gr-trellis/lib/encoder_impl.cc index 235367ca62..7ff4dac026 100644 --- a/gr-trellis/lib/encoder_impl.cc +++ b/gr-trellis/lib/encoder_impl.cc @@ -23,8 +23,8 @@ template <class IN_T, class OUT_T> typename encoder<IN_T, OUT_T>::sptr encoder<IN_T, OUT_T>::make(const fsm& FSM, int ST, int K) { - return gnuradio::get_initial_sptr( - new encoder_impl<IN_T, OUT_T>(FSM, ST, K, K >= 0 ? false : true)); + return gnuradio::make_block_sptr<encoder_impl<IN_T, OUT_T>>( + FSM, ST, K, K >= 0 ? false : true); } template <class IN_T, class OUT_T> diff --git a/gr-trellis/lib/metrics_impl.cc b/gr-trellis/lib/metrics_impl.cc index 649ed6e5ba..ef4233aaf4 100644 --- a/gr-trellis/lib/metrics_impl.cc +++ b/gr-trellis/lib/metrics_impl.cc @@ -28,7 +28,7 @@ typename metrics<T>::sptr metrics<T>::make(int O, const std::vector<T>& TABLE, digital::trellis_metric_type_t TYPE) { - return gnuradio::get_initial_sptr(new metrics_impl<T>(O, D, TABLE, TYPE)); + return gnuradio::make_block_sptr<metrics_impl<T>>(O, D, TABLE, TYPE); } template <class T> diff --git a/gr-trellis/lib/pccc_decoder_blk_impl.cc b/gr-trellis/lib/pccc_decoder_blk_impl.cc index cd9aac773d..9b3ebcb50d 100644 --- a/gr-trellis/lib/pccc_decoder_blk_impl.cc +++ b/gr-trellis/lib/pccc_decoder_blk_impl.cc @@ -34,16 +34,16 @@ pccc_decoder_blk<T>::make(const fsm& FSM1, int repetitions, siso_type_t SISO_TYPE) { - return gnuradio::get_initial_sptr(new pccc_decoder_blk_impl<T>(FSM1, - ST10, - ST1K, - FSM2, - ST20, - ST2K, - INTERLEAVER, - blocklength, - repetitions, - SISO_TYPE)); + return gnuradio::make_block_sptr<pccc_decoder_blk_impl<T>>(FSM1, + ST10, + ST1K, + FSM2, + ST20, + ST2K, + INTERLEAVER, + blocklength, + repetitions, + SISO_TYPE); } template <class T> diff --git a/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc b/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc index 3f2743bc8f..2e9df55b91 100644 --- a/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc +++ b/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc @@ -37,21 +37,21 @@ pccc_decoder_combined_blk<IN_T, OUT_T>::make(const fsm& FSMo, digital::trellis_metric_type_t METRIC_TYPE, float scaling) { - return gnuradio::get_initial_sptr( - new pccc_decoder_combined_blk_impl<IN_T, OUT_T>(FSMo, - STo0, - SToK, - FSMi, - STi0, - STiK, - INTERLEAVER, - blocklength, - repetitions, - SISO_TYPE, - D, - TABLE, - METRIC_TYPE, - scaling)); + return gnuradio::make_block_sptr<pccc_decoder_combined_blk_impl<IN_T, OUT_T>>( + FSMo, + STo0, + SToK, + FSMi, + STi0, + STiK, + INTERLEAVER, + blocklength, + repetitions, + SISO_TYPE, + D, + TABLE, + METRIC_TYPE, + scaling); } template <class IN_T, class OUT_T> diff --git a/gr-trellis/lib/pccc_encoder_impl.cc b/gr-trellis/lib/pccc_encoder_impl.cc index f0066072fb..728dc86ca9 100644 --- a/gr-trellis/lib/pccc_encoder_impl.cc +++ b/gr-trellis/lib/pccc_encoder_impl.cc @@ -28,8 +28,8 @@ pccc_encoder<IN_T, OUT_T>::make(const fsm& FSM1, const interleaver& INTERLEAVER, int blocklength) { - return gnuradio::get_initial_sptr(new pccc_encoder_impl<IN_T, OUT_T>( - FSM1, ST1, FSM2, ST2, INTERLEAVER, blocklength)); + return gnuradio::make_block_sptr<pccc_encoder_impl<IN_T, OUT_T>>( + FSM1, ST1, FSM2, ST2, INTERLEAVER, blocklength); } template <class IN_T, class OUT_T> diff --git a/gr-trellis/lib/permutation_impl.cc b/gr-trellis/lib/permutation_impl.cc index 461374aded..f97bcc4681 100644 --- a/gr-trellis/lib/permutation_impl.cc +++ b/gr-trellis/lib/permutation_impl.cc @@ -25,8 +25,8 @@ permutation::sptr permutation::make(int K, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL) { - return gnuradio::get_initial_sptr( - new permutation_impl(K, TABLE, SYMS_PER_BLOCK, BYTES_PER_SYMBOL)); + return gnuradio::make_block_sptr<permutation_impl>( + K, TABLE, SYMS_PER_BLOCK, BYTES_PER_SYMBOL); } permutation_impl::permutation_impl(int K, diff --git a/gr-trellis/lib/sccc_decoder_blk_impl.cc b/gr-trellis/lib/sccc_decoder_blk_impl.cc index c392ee8954..93a9ca4216 100644 --- a/gr-trellis/lib/sccc_decoder_blk_impl.cc +++ b/gr-trellis/lib/sccc_decoder_blk_impl.cc @@ -34,16 +34,16 @@ sccc_decoder_blk<T>::make(const fsm& FSMo, int repetitions, siso_type_t SISO_TYPE) { - return gnuradio::get_initial_sptr(new sccc_decoder_blk_impl<T>(FSMo, - STo0, - SToK, - FSMi, - STi0, - STiK, - INTERLEAVER, - blocklength, - repetitions, - SISO_TYPE)); + return gnuradio::make_block_sptr<sccc_decoder_blk_impl<T>>(FSMo, + STo0, + SToK, + FSMi, + STi0, + STiK, + INTERLEAVER, + blocklength, + repetitions, + SISO_TYPE); } template <class T> diff --git a/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc b/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc index 7b77c3a5cf..a3843346b9 100644 --- a/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc +++ b/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc @@ -37,21 +37,21 @@ sccc_decoder_combined_blk<IN_T, OUT_T>::make(const fsm& FSMo, digital::trellis_metric_type_t METRIC_TYPE, float scaling) { - return gnuradio::get_initial_sptr( - new sccc_decoder_combined_blk_impl<IN_T, OUT_T>(FSMo, - STo0, - SToK, - FSMi, - STi0, - STiK, - INTERLEAVER, - blocklength, - repetitions, - SISO_TYPE, - D, - TABLE, - METRIC_TYPE, - scaling)); + return gnuradio::make_block_sptr<sccc_decoder_combined_blk_impl<IN_T, OUT_T>>( + FSMo, + STo0, + SToK, + FSMi, + STi0, + STiK, + INTERLEAVER, + blocklength, + repetitions, + SISO_TYPE, + D, + TABLE, + METRIC_TYPE, + scaling); } template <class IN_T, class OUT_T> diff --git a/gr-trellis/lib/sccc_encoder_impl.cc b/gr-trellis/lib/sccc_encoder_impl.cc index ea0f33eb56..61087927ad 100644 --- a/gr-trellis/lib/sccc_encoder_impl.cc +++ b/gr-trellis/lib/sccc_encoder_impl.cc @@ -28,8 +28,8 @@ sccc_encoder<IN_T, OUT_T>::make(const fsm& FSMo, const interleaver& INTERLEAVER, int blocklength) { - return gnuradio::get_initial_sptr(new sccc_encoder_impl<IN_T, OUT_T>( - FSMo, STo, FSMi, STi, INTERLEAVER, blocklength)); + return gnuradio::make_block_sptr<sccc_encoder_impl<IN_T, OUT_T>>( + FSMo, STo, FSMi, STi, INTERLEAVER, blocklength); } template <class IN_T, class OUT_T> diff --git a/gr-trellis/lib/siso_combined_f_impl.cc b/gr-trellis/lib/siso_combined_f_impl.cc index 6586df30e0..d5eb980f76 100644 --- a/gr-trellis/lib/siso_combined_f_impl.cc +++ b/gr-trellis/lib/siso_combined_f_impl.cc @@ -32,8 +32,8 @@ siso_combined_f::sptr siso_combined_f::make(const fsm& FSM, const std::vector<float>& TABLE, digital::trellis_metric_type_t TYPE) { - return gnuradio::get_initial_sptr(new siso_combined_f_impl( - FSM, K, S0, SK, POSTI, POSTO, SISO_TYPE, D, TABLE, TYPE)); + return gnuradio::make_block_sptr<siso_combined_f_impl>( + FSM, K, S0, SK, POSTI, POSTO, SISO_TYPE, D, TABLE, TYPE); } void siso_combined_f_impl::recalculate() diff --git a/gr-trellis/lib/siso_f_impl.cc b/gr-trellis/lib/siso_f_impl.cc index 21d907928e..15e1cc1df0 100644 --- a/gr-trellis/lib/siso_f_impl.cc +++ b/gr-trellis/lib/siso_f_impl.cc @@ -24,8 +24,8 @@ namespace trellis { siso_f::sptr siso_f::make( const fsm& FSM, int K, int S0, int SK, bool POSTI, bool POSTO, siso_type_t SISO_TYPE) { - return gnuradio::get_initial_sptr( - new siso_f_impl(FSM, K, S0, SK, POSTI, POSTO, SISO_TYPE)); + return gnuradio::make_block_sptr<siso_f_impl>( + FSM, K, S0, SK, POSTI, POSTO, SISO_TYPE); } diff --git a/gr-trellis/lib/viterbi_combined_impl.cc b/gr-trellis/lib/viterbi_combined_impl.cc index 73cf50153d..e687e003e3 100644 --- a/gr-trellis/lib/viterbi_combined_impl.cc +++ b/gr-trellis/lib/viterbi_combined_impl.cc @@ -29,8 +29,8 @@ viterbi_combined<IN_T, OUT_T>::make(const fsm& FSM, const std::vector<IN_T>& TABLE, digital::trellis_metric_type_t TYPE) { - return gnuradio::get_initial_sptr( - new viterbi_combined_impl<IN_T, OUT_T>(FSM, K, S0, SK, D, TABLE, TYPE)); + return gnuradio::make_block_sptr<viterbi_combined_impl<IN_T, OUT_T>>( + FSM, K, S0, SK, D, TABLE, TYPE); } template <class IN_T, class OUT_T> diff --git a/gr-trellis/lib/viterbi_impl.cc b/gr-trellis/lib/viterbi_impl.cc index 7b5f2e8264..9ad0b9670b 100644 --- a/gr-trellis/lib/viterbi_impl.cc +++ b/gr-trellis/lib/viterbi_impl.cc @@ -23,7 +23,7 @@ namespace trellis { template <class T> typename viterbi<T>::sptr viterbi<T>::make(const fsm& FSM, int K, int S0, int SK) { - return gnuradio::get_initial_sptr(new viterbi_impl<T>(FSM, K, S0, SK)); + return gnuradio::make_block_sptr<viterbi_impl<T>>(FSM, K, S0, SK); } template <class T> diff --git a/gr-uhd/lib/rfnoc_block_generic_impl.cc b/gr-uhd/lib/rfnoc_block_generic_impl.cc index 90bdc35c55..1705e38e8a 100644 --- a/gr-uhd/lib/rfnoc_block_generic_impl.cc +++ b/gr-uhd/lib/rfnoc_block_generic_impl.cc @@ -26,9 +26,9 @@ rfnoc_block_generic::make(rfnoc_graph::sptr graph, const int device_select, const int block_select) { - return gnuradio::get_initial_sptr( - new rfnoc_block_generic_impl(rfnoc_block::make_block_ref( - graph, block_args, block_name, device_select, block_select))); + return gnuradio::make_block_sptr<rfnoc_block_generic_impl>( + rfnoc_block::make_block_ref( + graph, block_args, block_name, device_select, block_select)); } rfnoc_block_generic_impl::rfnoc_block_generic_impl( diff --git a/gr-uhd/lib/rfnoc_ddc_impl.cc b/gr-uhd/lib/rfnoc_ddc_impl.cc index 7559c6acfa..bbc1978f76 100644 --- a/gr-uhd/lib/rfnoc_ddc_impl.cc +++ b/gr-uhd/lib/rfnoc_ddc_impl.cc @@ -21,8 +21,8 @@ rfnoc_ddc::sptr rfnoc_ddc::make(rfnoc_graph::sptr graph, const int device_select, const int instance) { - return gnuradio::get_initial_sptr(new rfnoc_ddc_impl( - rfnoc_block::make_block_ref(graph, block_args, "DDC", device_select, instance))); + return gnuradio::make_block_sptr<rfnoc_ddc_impl>( + rfnoc_block::make_block_ref(graph, block_args, "DDC", device_select, instance)); } diff --git a/gr-uhd/lib/rfnoc_duc_impl.cc b/gr-uhd/lib/rfnoc_duc_impl.cc index c77f2313b4..b542f34cd3 100644 --- a/gr-uhd/lib/rfnoc_duc_impl.cc +++ b/gr-uhd/lib/rfnoc_duc_impl.cc @@ -21,8 +21,8 @@ rfnoc_duc::sptr rfnoc_duc::make(rfnoc_graph::sptr graph, const int device_select, const int instance) { - return gnuradio::get_initial_sptr(new rfnoc_duc_impl( - rfnoc_block::make_block_ref(graph, block_args, "DUC", device_select, instance))); + return gnuradio::make_block_sptr<rfnoc_duc_impl>( + rfnoc_block::make_block_ref(graph, block_args, "DUC", device_select, instance)); } diff --git a/gr-uhd/lib/rfnoc_rx_radio_impl.cc b/gr-uhd/lib/rfnoc_rx_radio_impl.cc index 3012e0fbf7..f6786cbfe3 100644 --- a/gr-uhd/lib/rfnoc_rx_radio_impl.cc +++ b/gr-uhd/lib/rfnoc_rx_radio_impl.cc @@ -23,8 +23,8 @@ rfnoc_rx_radio::sptr rfnoc_rx_radio::make(rfnoc_graph::sptr graph, const int device_select, const int instance) { - return gnuradio::get_initial_sptr(new rfnoc_rx_radio_impl(rfnoc_block::make_block_ref( - graph, block_args, "Radio", device_select, instance, MAX_RADIO_REFS))); + return gnuradio::make_block_sptr<rfnoc_rx_radio_impl>(rfnoc_block::make_block_ref( + graph, block_args, "Radio", device_select, instance, MAX_RADIO_REFS)); } diff --git a/gr-uhd/lib/rfnoc_rx_streamer_impl.cc b/gr-uhd/lib/rfnoc_rx_streamer_impl.cc index ee7e854cde..cb85d347db 100644 --- a/gr-uhd/lib/rfnoc_rx_streamer_impl.cc +++ b/gr-uhd/lib/rfnoc_rx_streamer_impl.cc @@ -33,8 +33,8 @@ rfnoc_rx_streamer::sptr rfnoc_rx_streamer::make(rfnoc_graph::sptr graph, const size_t vlen, const bool issue_stream_cmd_on_start) { - return gnuradio::get_initial_sptr(new rfnoc_rx_streamer_impl( - graph, num_chans, stream_args, vlen, issue_stream_cmd_on_start)); + return gnuradio::make_block_sptr<rfnoc_rx_streamer_impl>( + graph, num_chans, stream_args, vlen, issue_stream_cmd_on_start); } diff --git a/gr-uhd/lib/rfnoc_tx_radio_impl.cc b/gr-uhd/lib/rfnoc_tx_radio_impl.cc index 531eb75396..64190dd2d1 100644 --- a/gr-uhd/lib/rfnoc_tx_radio_impl.cc +++ b/gr-uhd/lib/rfnoc_tx_radio_impl.cc @@ -23,8 +23,8 @@ rfnoc_tx_radio::sptr rfnoc_tx_radio::make(rfnoc_graph::sptr graph, const int device_select, const int instance) { - return gnuradio::get_initial_sptr(new rfnoc_tx_radio_impl(rfnoc_block::make_block_ref( - graph, block_args, "Radio", device_select, instance, MAX_RADIO_REFS))); + return gnuradio::make_block_sptr<rfnoc_tx_radio_impl>(rfnoc_block::make_block_ref( + graph, block_args, "Radio", device_select, instance, MAX_RADIO_REFS)); } diff --git a/gr-uhd/lib/rfnoc_tx_streamer_impl.cc b/gr-uhd/lib/rfnoc_tx_streamer_impl.cc index 9a12a8b3f2..3dcc43ab3c 100644 --- a/gr-uhd/lib/rfnoc_tx_streamer_impl.cc +++ b/gr-uhd/lib/rfnoc_tx_streamer_impl.cc @@ -26,8 +26,8 @@ rfnoc_tx_streamer::sptr rfnoc_tx_streamer::make(rfnoc_graph::sptr graph, const ::uhd::stream_args_t& stream_args, const size_t vlen) { - return gnuradio::get_initial_sptr( - new rfnoc_tx_streamer_impl(graph, num_chans, stream_args, vlen)); + return gnuradio::make_block_sptr<rfnoc_tx_streamer_impl>( + graph, num_chans, stream_args, vlen); } diff --git a/gr-video-sdl/lib/sink_s_impl.cc b/gr-video-sdl/lib/sink_s_impl.cc index 18bbb94814..641f56bf8f 100644 --- a/gr-video-sdl/lib/sink_s_impl.cc +++ b/gr-video-sdl/lib/sink_s_impl.cc @@ -35,8 +35,8 @@ sink_s::sptr sink_s::make(double framerate, int dst_width, int dst_height) { - return gnuradio::get_initial_sptr( - new sink_s_impl(framerate, width, height, format, dst_width, dst_height)); + return gnuradio::make_block_sptr<sink_s_impl>( + framerate, width, height, format, dst_width, dst_height); } sink_s_impl::sink_s_impl(double framerate, diff --git a/gr-video-sdl/lib/sink_uc_impl.cc b/gr-video-sdl/lib/sink_uc_impl.cc index 55c0242797..e26fe54c83 100644 --- a/gr-video-sdl/lib/sink_uc_impl.cc +++ b/gr-video-sdl/lib/sink_uc_impl.cc @@ -34,8 +34,8 @@ sink_uc::sptr sink_uc::make(double framerate, int dst_width, int dst_height) { - return gnuradio::get_initial_sptr( - new sink_uc_impl(framerate, width, height, format, dst_width, dst_height)); + return gnuradio::make_block_sptr<sink_uc_impl>( + framerate, width, height, format, dst_width, dst_height); } sink_uc_impl::sink_uc_impl(double framerate, diff --git a/gr-vocoder/lib/alaw_decode_bs_impl.cc b/gr-vocoder/lib/alaw_decode_bs_impl.cc index f2703a69c3..41b48e5e77 100644 --- a/gr-vocoder/lib/alaw_decode_bs_impl.cc +++ b/gr-vocoder/lib/alaw_decode_bs_impl.cc @@ -25,7 +25,7 @@ extern "C" { alaw_decode_bs::sptr alaw_decode_bs::make() { - return gnuradio::get_initial_sptr(new alaw_decode_bs_impl()); + return gnuradio::make_block_sptr<alaw_decode_bs_impl>(); } alaw_decode_bs_impl::alaw_decode_bs_impl() diff --git a/gr-vocoder/lib/alaw_encode_sb_impl.cc b/gr-vocoder/lib/alaw_encode_sb_impl.cc index 2c4cc79e57..e3f5f4ed05 100644 --- a/gr-vocoder/lib/alaw_encode_sb_impl.cc +++ b/gr-vocoder/lib/alaw_encode_sb_impl.cc @@ -25,7 +25,7 @@ extern "C" { alaw_encode_sb::sptr alaw_encode_sb::make() { - return gnuradio::get_initial_sptr(new alaw_encode_sb_impl()); + return gnuradio::make_block_sptr<alaw_encode_sb_impl>(); } alaw_encode_sb_impl::alaw_encode_sb_impl() diff --git a/gr-vocoder/lib/codec2_decode_ps_impl.cc b/gr-vocoder/lib/codec2_decode_ps_impl.cc index 3db105f6c5..40d5059e9f 100644 --- a/gr-vocoder/lib/codec2_decode_ps_impl.cc +++ b/gr-vocoder/lib/codec2_decode_ps_impl.cc @@ -36,8 +36,8 @@ codec2_decode_ps::sptr codec2_decode_ps::make(int mode) bits_per_frame = codec2_bits_per_frame(codec2); codec2_destroy(codec2); - return gnuradio::get_initial_sptr( - new codec2_decode_ps_impl(mode, samples_per_frame, bits_per_frame)); + return gnuradio::make_block_sptr<codec2_decode_ps_impl>( + mode, samples_per_frame, bits_per_frame); } diff --git a/gr-vocoder/lib/codec2_encode_sp_impl.cc b/gr-vocoder/lib/codec2_encode_sp_impl.cc index 3b5413067c..c019e31cbe 100644 --- a/gr-vocoder/lib/codec2_encode_sp_impl.cc +++ b/gr-vocoder/lib/codec2_encode_sp_impl.cc @@ -37,8 +37,8 @@ codec2_encode_sp::sptr codec2_encode_sp::make(int mode) bits_per_frame = codec2_bits_per_frame(codec2); codec2_destroy(codec2); - return gnuradio::get_initial_sptr( - new codec2_encode_sp_impl(mode, samples_per_frame, bits_per_frame)); + return gnuradio::make_block_sptr<codec2_encode_sp_impl>( + mode, samples_per_frame, bits_per_frame); } codec2_encode_sp_impl::codec2_encode_sp_impl(int mode, diff --git a/gr-vocoder/lib/cvsd_decode_bs_impl.cc b/gr-vocoder/lib/cvsd_decode_bs_impl.cc index 3aa24f3f52..f88b86d673 100644 --- a/gr-vocoder/lib/cvsd_decode_bs_impl.cc +++ b/gr-vocoder/lib/cvsd_decode_bs_impl.cc @@ -28,8 +28,8 @@ cvsd_decode_bs::sptr cvsd_decode_bs::make(short min_step, short pos_accum_max, short neg_accum_max) { - return gnuradio::get_initial_sptr(new cvsd_decode_bs_impl( - min_step, max_step, step_decay, accum_decay, K, J, pos_accum_max, neg_accum_max)); + return gnuradio::make_block_sptr<cvsd_decode_bs_impl>( + min_step, max_step, step_decay, accum_decay, K, J, pos_accum_max, neg_accum_max); } cvsd_decode_bs_impl::cvsd_decode_bs_impl(short min_step, diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.cc b/gr-vocoder/lib/cvsd_encode_sb_impl.cc index 6b60b59e07..1cb6f2f13b 100644 --- a/gr-vocoder/lib/cvsd_encode_sb_impl.cc +++ b/gr-vocoder/lib/cvsd_encode_sb_impl.cc @@ -28,8 +28,8 @@ cvsd_encode_sb::sptr cvsd_encode_sb::make(short min_step, short pos_accum_max, short neg_accum_max) { - return gnuradio::get_initial_sptr(new cvsd_encode_sb_impl( - min_step, max_step, step_decay, accum_decay, K, J, pos_accum_max, neg_accum_max)); + return gnuradio::make_block_sptr<cvsd_encode_sb_impl>( + min_step, max_step, step_decay, accum_decay, K, J, pos_accum_max, neg_accum_max); } cvsd_encode_sb_impl::cvsd_encode_sb_impl(short min_step, diff --git a/gr-vocoder/lib/freedv_rx_ss_impl.cc b/gr-vocoder/lib/freedv_rx_ss_impl.cc index 838408ec38..03bfdda08f 100644 --- a/gr-vocoder/lib/freedv_rx_ss_impl.cc +++ b/gr-vocoder/lib/freedv_rx_ss_impl.cc @@ -38,8 +38,8 @@ namespace vocoder { freedv_rx_ss::sptr freedv_rx_ss::make(int mode, float squelch_thresh, int interleave_frames) { - return gnuradio::get_initial_sptr( - new freedv_rx_ss_impl(mode, squelch_thresh, interleave_frames)); + return gnuradio::make_block_sptr<freedv_rx_ss_impl>( + mode, squelch_thresh, interleave_frames); } freedv_rx_ss_impl::freedv_rx_ss_impl(int mode, diff --git a/gr-vocoder/lib/freedv_tx_ss_impl.cc b/gr-vocoder/lib/freedv_tx_ss_impl.cc index 333f2adbbd..310a2137e6 100644 --- a/gr-vocoder/lib/freedv_tx_ss_impl.cc +++ b/gr-vocoder/lib/freedv_tx_ss_impl.cc @@ -43,8 +43,7 @@ namespace vocoder { freedv_tx_ss::sptr freedv_tx_ss::make(int mode, const std::string msg_txt, int interleave_frames) { - return gnuradio::get_initial_sptr( - new freedv_tx_ss_impl(mode, msg_txt, interleave_frames)); + return gnuradio::make_block_sptr<freedv_tx_ss_impl>(mode, msg_txt, interleave_frames); } freedv_tx_ss_impl::freedv_tx_ss_impl(int mode, diff --git a/gr-vocoder/lib/g721_decode_bs_impl.cc b/gr-vocoder/lib/g721_decode_bs_impl.cc index 2db0b57503..319f300da2 100644 --- a/gr-vocoder/lib/g721_decode_bs_impl.cc +++ b/gr-vocoder/lib/g721_decode_bs_impl.cc @@ -21,7 +21,7 @@ namespace vocoder { g721_decode_bs::sptr g721_decode_bs::make() { - return gnuradio::get_initial_sptr(new g721_decode_bs_impl()); + return gnuradio::make_block_sptr<g721_decode_bs_impl>(); } g721_decode_bs_impl::g721_decode_bs_impl() diff --git a/gr-vocoder/lib/g721_encode_sb_impl.cc b/gr-vocoder/lib/g721_encode_sb_impl.cc index faeee26121..b02b34ba43 100644 --- a/gr-vocoder/lib/g721_encode_sb_impl.cc +++ b/gr-vocoder/lib/g721_encode_sb_impl.cc @@ -21,7 +21,7 @@ namespace vocoder { g721_encode_sb::sptr g721_encode_sb::make() { - return gnuradio::get_initial_sptr(new g721_encode_sb_impl()); + return gnuradio::make_block_sptr<g721_encode_sb_impl>(); } g721_encode_sb_impl::g721_encode_sb_impl() diff --git a/gr-vocoder/lib/g723_24_decode_bs_impl.cc b/gr-vocoder/lib/g723_24_decode_bs_impl.cc index 6a446453bc..a05c292d5d 100644 --- a/gr-vocoder/lib/g723_24_decode_bs_impl.cc +++ b/gr-vocoder/lib/g723_24_decode_bs_impl.cc @@ -21,7 +21,7 @@ namespace vocoder { g723_24_decode_bs::sptr g723_24_decode_bs::make() { - return gnuradio::get_initial_sptr(new g723_24_decode_bs_impl()); + return gnuradio::make_block_sptr<g723_24_decode_bs_impl>(); } g723_24_decode_bs_impl::g723_24_decode_bs_impl() diff --git a/gr-vocoder/lib/g723_24_encode_sb_impl.cc b/gr-vocoder/lib/g723_24_encode_sb_impl.cc index 367dc24961..9f4899ee20 100644 --- a/gr-vocoder/lib/g723_24_encode_sb_impl.cc +++ b/gr-vocoder/lib/g723_24_encode_sb_impl.cc @@ -21,7 +21,7 @@ namespace vocoder { g723_24_encode_sb::sptr g723_24_encode_sb::make() { - return gnuradio::get_initial_sptr(new g723_24_encode_sb_impl()); + return gnuradio::make_block_sptr<g723_24_encode_sb_impl>(); } g723_24_encode_sb_impl::g723_24_encode_sb_impl() diff --git a/gr-vocoder/lib/g723_40_decode_bs_impl.cc b/gr-vocoder/lib/g723_40_decode_bs_impl.cc index 99c5ee9646..ebf6aeb20b 100644 --- a/gr-vocoder/lib/g723_40_decode_bs_impl.cc +++ b/gr-vocoder/lib/g723_40_decode_bs_impl.cc @@ -21,7 +21,7 @@ namespace vocoder { g723_40_decode_bs::sptr g723_40_decode_bs::make() { - return gnuradio::get_initial_sptr(new g723_40_decode_bs_impl()); + return gnuradio::make_block_sptr<g723_40_decode_bs_impl>(); } g723_40_decode_bs_impl::g723_40_decode_bs_impl() diff --git a/gr-vocoder/lib/g723_40_encode_sb_impl.cc b/gr-vocoder/lib/g723_40_encode_sb_impl.cc index 5ca06289ac..29610fa463 100644 --- a/gr-vocoder/lib/g723_40_encode_sb_impl.cc +++ b/gr-vocoder/lib/g723_40_encode_sb_impl.cc @@ -21,7 +21,7 @@ namespace vocoder { g723_40_encode_sb::sptr g723_40_encode_sb::make() { - return gnuradio::get_initial_sptr(new g723_40_encode_sb_impl()); + return gnuradio::make_block_sptr<g723_40_encode_sb_impl>(); } g723_40_encode_sb_impl::g723_40_encode_sb_impl() diff --git a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc index 25106f36ed..a86d0906fd 100644 --- a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc +++ b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc @@ -23,7 +23,7 @@ namespace vocoder { gsm_fr_decode_ps::sptr gsm_fr_decode_ps::make() { - return gnuradio::get_initial_sptr(new gsm_fr_decode_ps_impl()); + return gnuradio::make_block_sptr<gsm_fr_decode_ps_impl>(); } gsm_fr_decode_ps_impl::gsm_fr_decode_ps_impl() diff --git a/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc b/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc index 758718d6ce..c1446ed0bf 100644 --- a/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc +++ b/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc @@ -22,7 +22,7 @@ namespace vocoder { gsm_fr_encode_sp::sptr gsm_fr_encode_sp::make() { - return gnuradio::get_initial_sptr(new gsm_fr_encode_sp_impl()); + return gnuradio::make_block_sptr<gsm_fr_encode_sp_impl>(); } gsm_fr_encode_sp_impl::gsm_fr_encode_sp_impl() diff --git a/gr-vocoder/lib/ulaw_decode_bs_impl.cc b/gr-vocoder/lib/ulaw_decode_bs_impl.cc index 49b8cf3640..508b947571 100644 --- a/gr-vocoder/lib/ulaw_decode_bs_impl.cc +++ b/gr-vocoder/lib/ulaw_decode_bs_impl.cc @@ -25,7 +25,7 @@ extern "C" { ulaw_decode_bs::sptr ulaw_decode_bs::make() { - return gnuradio::get_initial_sptr(new ulaw_decode_bs_impl()); + return gnuradio::make_block_sptr<ulaw_decode_bs_impl>(); } ulaw_decode_bs_impl::ulaw_decode_bs_impl() diff --git a/gr-vocoder/lib/ulaw_encode_sb_impl.cc b/gr-vocoder/lib/ulaw_encode_sb_impl.cc index 33e96ee78c..e5b503abf8 100644 --- a/gr-vocoder/lib/ulaw_encode_sb_impl.cc +++ b/gr-vocoder/lib/ulaw_encode_sb_impl.cc @@ -25,7 +25,7 @@ extern "C" { ulaw_encode_sb::sptr ulaw_encode_sb::make() { - return gnuradio::get_initial_sptr(new ulaw_encode_sb_impl()); + return gnuradio::make_block_sptr<ulaw_encode_sb_impl>(); } ulaw_encode_sb_impl::ulaw_encode_sb_impl() diff --git a/gr-wavelet/lib/squash_ff_impl.cc b/gr-wavelet/lib/squash_ff_impl.cc index 6a958a0bee..ec5b4d314c 100644 --- a/gr-wavelet/lib/squash_ff_impl.cc +++ b/gr-wavelet/lib/squash_ff_impl.cc @@ -25,7 +25,7 @@ namespace wavelet { squash_ff::sptr squash_ff::make(const std::vector<float>& igrid, const std::vector<float>& ogrid) { - return gnuradio::get_initial_sptr(new squash_ff_impl(igrid, ogrid)); + return gnuradio::make_block_sptr<squash_ff_impl>(igrid, ogrid); } squash_ff_impl::squash_ff_impl(const std::vector<float>& igrid, diff --git a/gr-wavelet/lib/wavelet_ff_impl.cc b/gr-wavelet/lib/wavelet_ff_impl.cc index 912115e11d..72287374e0 100644 --- a/gr-wavelet/lib/wavelet_ff_impl.cc +++ b/gr-wavelet/lib/wavelet_ff_impl.cc @@ -26,7 +26,7 @@ namespace wavelet { wavelet_ff::sptr wavelet_ff::make(int size, int order, bool forward) { - return gnuradio::get_initial_sptr(new wavelet_ff_impl(size, order, forward)); + return gnuradio::make_block_sptr<wavelet_ff_impl>(size, order, forward); } wavelet_ff_impl::wavelet_ff_impl(int size, int order, bool forward) diff --git a/gr-wavelet/lib/wvps_ff_impl.cc b/gr-wavelet/lib/wvps_ff_impl.cc index 3e5ae9ee06..e1ffa39ecb 100644 --- a/gr-wavelet/lib/wvps_ff_impl.cc +++ b/gr-wavelet/lib/wvps_ff_impl.cc @@ -29,7 +29,7 @@ static int ceil_log2(int k) wvps_ff::sptr wvps_ff::make(int ilen) { - return gnuradio::get_initial_sptr(new wvps_ff_impl(ilen)); + return gnuradio::make_block_sptr<wvps_ff_impl>(ilen); } wvps_ff_impl::wvps_ff_impl(int ilen) diff --git a/gr-zeromq/lib/pub_msg_sink_impl.cc b/gr-zeromq/lib/pub_msg_sink_impl.cc index 924b68a436..232597e814 100644 --- a/gr-zeromq/lib/pub_msg_sink_impl.cc +++ b/gr-zeromq/lib/pub_msg_sink_impl.cc @@ -21,7 +21,7 @@ namespace zeromq { pub_msg_sink::sptr pub_msg_sink::make(char* address, int timeout, bool bind) { - return gnuradio::get_initial_sptr(new pub_msg_sink_impl(address, timeout, bind)); + return gnuradio::make_block_sptr<pub_msg_sink_impl>(address, timeout, bind); } pub_msg_sink_impl::pub_msg_sink_impl(char* address, int timeout, bool bind) diff --git a/gr-zeromq/lib/pub_sink_impl.cc b/gr-zeromq/lib/pub_sink_impl.cc index 84a7364152..460484bc0d 100644 --- a/gr-zeromq/lib/pub_sink_impl.cc +++ b/gr-zeromq/lib/pub_sink_impl.cc @@ -27,8 +27,8 @@ pub_sink::sptr pub_sink::make(size_t itemsize, int hwm, const std::string& key) { - return gnuradio::get_initial_sptr( - new pub_sink_impl(itemsize, vlen, address, timeout, pass_tags, hwm, key)); + return gnuradio::make_block_sptr<pub_sink_impl>( + itemsize, vlen, address, timeout, pass_tags, hwm, key); } pub_sink_impl::pub_sink_impl(size_t itemsize, diff --git a/gr-zeromq/lib/pull_msg_source_impl.cc b/gr-zeromq/lib/pull_msg_source_impl.cc index 0520ba5abc..9a467e597f 100644 --- a/gr-zeromq/lib/pull_msg_source_impl.cc +++ b/gr-zeromq/lib/pull_msg_source_impl.cc @@ -23,7 +23,7 @@ namespace zeromq { pull_msg_source::sptr pull_msg_source::make(char* address, int timeout, bool bind) { - return gnuradio::get_initial_sptr(new pull_msg_source_impl(address, timeout, bind)); + return gnuradio::make_block_sptr<pull_msg_source_impl>(address, timeout, bind); } pull_msg_source_impl::pull_msg_source_impl(char* address, int timeout, bool bind) diff --git a/gr-zeromq/lib/pull_source_impl.cc b/gr-zeromq/lib/pull_source_impl.cc index 7d184eef38..bcde5aea15 100644 --- a/gr-zeromq/lib/pull_source_impl.cc +++ b/gr-zeromq/lib/pull_source_impl.cc @@ -22,8 +22,8 @@ namespace zeromq { pull_source::sptr pull_source::make( size_t itemsize, size_t vlen, char* address, int timeout, bool pass_tags, int hwm) { - return gnuradio::get_initial_sptr( - new pull_source_impl(itemsize, vlen, address, timeout, pass_tags, hwm)); + return gnuradio::make_block_sptr<pull_source_impl>( + itemsize, vlen, address, timeout, pass_tags, hwm); } pull_source_impl::pull_source_impl( diff --git a/gr-zeromq/lib/push_msg_sink_impl.cc b/gr-zeromq/lib/push_msg_sink_impl.cc index f43cf9d487..b32bea620b 100644 --- a/gr-zeromq/lib/push_msg_sink_impl.cc +++ b/gr-zeromq/lib/push_msg_sink_impl.cc @@ -21,7 +21,7 @@ namespace zeromq { push_msg_sink::sptr push_msg_sink::make(char* address, int timeout, bool bind) { - return gnuradio::get_initial_sptr(new push_msg_sink_impl(address, timeout, bind)); + return gnuradio::make_block_sptr<push_msg_sink_impl>(address, timeout, bind); } push_msg_sink_impl::push_msg_sink_impl(char* address, int timeout, bool bind) diff --git a/gr-zeromq/lib/push_sink_impl.cc b/gr-zeromq/lib/push_sink_impl.cc index 576dc76017..fb3d3f323a 100644 --- a/gr-zeromq/lib/push_sink_impl.cc +++ b/gr-zeromq/lib/push_sink_impl.cc @@ -22,8 +22,8 @@ namespace zeromq { push_sink::sptr push_sink::make( size_t itemsize, size_t vlen, char* address, int timeout, bool pass_tags, int hwm) { - return gnuradio::get_initial_sptr( - new push_sink_impl(itemsize, vlen, address, timeout, pass_tags, hwm)); + return gnuradio::make_block_sptr<push_sink_impl>( + itemsize, vlen, address, timeout, pass_tags, hwm); } push_sink_impl::push_sink_impl( diff --git a/gr-zeromq/lib/rep_msg_sink_impl.cc b/gr-zeromq/lib/rep_msg_sink_impl.cc index 5bf7d634ce..5496d26253 100644 --- a/gr-zeromq/lib/rep_msg_sink_impl.cc +++ b/gr-zeromq/lib/rep_msg_sink_impl.cc @@ -21,7 +21,7 @@ namespace zeromq { rep_msg_sink::sptr rep_msg_sink::make(char* address, int timeout, bool bind) { - return gnuradio::get_initial_sptr(new rep_msg_sink_impl(address, timeout, bind)); + return gnuradio::make_block_sptr<rep_msg_sink_impl>(address, timeout, bind); } rep_msg_sink_impl::rep_msg_sink_impl(char* address, int timeout, bool bind) diff --git a/gr-zeromq/lib/rep_sink_impl.cc b/gr-zeromq/lib/rep_sink_impl.cc index c04864da7a..7f207f53ad 100644 --- a/gr-zeromq/lib/rep_sink_impl.cc +++ b/gr-zeromq/lib/rep_sink_impl.cc @@ -22,8 +22,8 @@ namespace zeromq { rep_sink::sptr rep_sink::make( size_t itemsize, size_t vlen, char* address, int timeout, bool pass_tags, int hwm) { - return gnuradio::get_initial_sptr( - new rep_sink_impl(itemsize, vlen, address, timeout, pass_tags, hwm)); + return gnuradio::make_block_sptr<rep_sink_impl>( + itemsize, vlen, address, timeout, pass_tags, hwm); } rep_sink_impl::rep_sink_impl( diff --git a/gr-zeromq/lib/req_msg_source_impl.cc b/gr-zeromq/lib/req_msg_source_impl.cc index d55829a815..a1d2bf76f7 100644 --- a/gr-zeromq/lib/req_msg_source_impl.cc +++ b/gr-zeromq/lib/req_msg_source_impl.cc @@ -23,7 +23,7 @@ namespace zeromq { req_msg_source::sptr req_msg_source::make(char* address, int timeout, bool bind) { - return gnuradio::get_initial_sptr(new req_msg_source_impl(address, timeout, bind)); + return gnuradio::make_block_sptr<req_msg_source_impl>(address, timeout, bind); } req_msg_source_impl::req_msg_source_impl(char* address, int timeout, bool bind) diff --git a/gr-zeromq/lib/req_source_impl.cc b/gr-zeromq/lib/req_source_impl.cc index fb1f28b75b..b200ed076c 100644 --- a/gr-zeromq/lib/req_source_impl.cc +++ b/gr-zeromq/lib/req_source_impl.cc @@ -22,8 +22,8 @@ namespace zeromq { req_source::sptr req_source::make( size_t itemsize, size_t vlen, char* address, int timeout, bool pass_tags, int hwm) { - return gnuradio::get_initial_sptr( - new req_source_impl(itemsize, vlen, address, timeout, pass_tags, hwm)); + return gnuradio::make_block_sptr<req_source_impl>( + itemsize, vlen, address, timeout, pass_tags, hwm); } req_source_impl::req_source_impl( diff --git a/gr-zeromq/lib/sub_msg_source_impl.cc b/gr-zeromq/lib/sub_msg_source_impl.cc index 281c5b1995..d5b06b4df1 100644 --- a/gr-zeromq/lib/sub_msg_source_impl.cc +++ b/gr-zeromq/lib/sub_msg_source_impl.cc @@ -23,7 +23,7 @@ namespace zeromq { sub_msg_source::sptr sub_msg_source::make(char* address, int timeout, bool bind) { - return gnuradio::get_initial_sptr(new sub_msg_source_impl(address, timeout, bind)); + return gnuradio::make_block_sptr<sub_msg_source_impl>(address, timeout, bind); } sub_msg_source_impl::sub_msg_source_impl(char* address, int timeout, bool bind) diff --git a/gr-zeromq/lib/sub_source_impl.cc b/gr-zeromq/lib/sub_source_impl.cc index 7fe5eabc3c..ddc2eb7ad8 100644 --- a/gr-zeromq/lib/sub_source_impl.cc +++ b/gr-zeromq/lib/sub_source_impl.cc @@ -27,8 +27,8 @@ sub_source::sptr sub_source::make(size_t itemsize, int hwm, const std::string& key) { - return gnuradio::get_initial_sptr( - new sub_source_impl(itemsize, vlen, address, timeout, pass_tags, hwm, key)); + return gnuradio::make_block_sptr<sub_source_impl>( + itemsize, vlen, address, timeout, pass_tags, hwm, key); } sub_source_impl::sub_source_impl(size_t itemsize, |