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

14 files changed, 67 insertions, 68 deletions

diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.cc b/gr-trellis/lib/constellation_metrics_cf_impl.cc
index f580a5a3e..14c4ce5ff 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 235367ca6..7ff4dac02 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 649ed6e5b..ef4233aaf 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 cd9aac773..9b3ebcb50 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 3f2743bc8..2e9df55b9 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 f0066072f..728dc86ca 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 461374ade..f97bcc468 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 c392ee895..93a9ca421 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 7b77c3a5c..a3843346b 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 ea0f33eb5..61087927a 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 6586df30e..d5eb980f7 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 21d907928..15e1cc1df 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 73cf50153..e687e003e 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 7b5f2e826..9ad0b9670 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>