Replace all calls to get_initial_sptr with make_block_sptr

First batch of changes:

```
find […] -print0 | xargs -0 sed -i -r '/get_initial_sptr/{:nxt N;/;/!b nxt;s/get_initial_sptr\(\s*new ([^(]+)(.*)\)\)/make_block_sptr<\1>\2)/}'
```

Then:
* Back out `sptr_magic.h` edits
* Change some `friend` clauses
* clang-format the whole thing
* Update checksums in the pybind11 bindings files

Author: ThomasHabets

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.

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;
 

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() {}

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,

gnuradio-runtime/lib/test.h

@@ -205,19 +205,8 @@ class GR_RUNTIME_API test : public block
          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 */

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)

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>

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>

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>

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,

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() {}

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,

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)

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)

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)

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)

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)

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 <>

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)

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)

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)

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>

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)

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,

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)

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)

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)

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)

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)

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,

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,

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)

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)

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>

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>

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)

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>