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-fft/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-fft/lib')
| -rw-r--r-- | gr-fft/lib/ctrlport_probe_psd_impl.cc | 2 | ||||
| -rw-r--r-- | gr-fft/lib/fft_vcc_fftw.cc | 4 | ||||
| -rw-r--r-- | gr-fft/lib/fft_vfc_fftw.cc | 3 | ||||
| -rw-r--r-- | gr-fft/lib/goertzel_fc_impl.cc | 2 |
4 files changed, 5 insertions, 6 deletions
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) |