diff options
| author | Thomas Habets <thomas@habets.se> | 2020-05-03 12:23:51 +0100 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2020-07-30 18:12:44 +0200 |
| commit | 30643f01609e915296023adc37123e27e2c86d3f (patch) | |
| tree | caf7141e8091cd30cde4e75ef0d1fcc5454ace77 /gr-wavelet/lib | |
| parent | 875148321bca3c39af9aec8dee3c24eb9f75d1e6 (diff) | |
Replace all calls to `get_initial_sptr` with `make_block_sptr`
First batch of changes:
```
find […] -print0 | xargs -0 sed -i -r '/get_initial_sptr/{:nxt N;/;/!b nxt;s/get_initial_sptr\(\s*new ([^(]+)(.*)\)\)/make_block_sptr<\1>\2)/}'
```
Then:
* Back out `sptr_magic.h` edits
* Change some `friend` clauses
* clang-format the whole thing
* Update checksums in the pybind11 bindings files
Diffstat (limited to 'gr-wavelet/lib')
| -rw-r--r-- | gr-wavelet/lib/squash_ff_impl.cc | 2 | ||||
| -rw-r--r-- | gr-wavelet/lib/wavelet_ff_impl.cc | 2 | ||||
| -rw-r--r-- | gr-wavelet/lib/wvps_ff_impl.cc | 2 |
3 files changed, 3 insertions, 3 deletions
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) |