From 30643f01609e915296023adc37123e27e2c86d3f Mon Sep 17 00:00:00 2001
From: Thomas Habets <thomas@habets.se>
Date: Sun, 3 May 2020 12:23:51 +0100
Subject: Replace all calls to `get_initial_sptr` with `make_block_sptr`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
---
gr-trellis/lib/sccc_decoder_combined_blk_impl.cc | 30 ++++++++++++------------
1 file changed, 15 insertions(+), 15 deletions(-)
(limited to 'gr-trellis/lib/sccc_decoder_combined_blk_impl.cc')
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>
--
cgit v1.2.3