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-channels/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-channels/lib')
| -rw-r--r-- | gr-channels/lib/cfo_model_impl.cc | 4 | ||||
| -rw-r--r-- | gr-channels/lib/channel_model2_impl.cc | 4 | ||||
| -rw-r--r-- | gr-channels/lib/channel_model_impl.cc | 4 | ||||
| -rw-r--r-- | gr-channels/lib/dynamic_channel_model_impl.cc | 28 | ||||
| -rw-r--r-- | gr-channels/lib/fading_model_impl.cc | 2 | ||||
| -rw-r--r-- | gr-channels/lib/selective_fading_model2_impl.cc | 4 | ||||
| -rw-r--r-- | gr-channels/lib/selective_fading_model_impl.cc | 4 | ||||
| -rw-r--r-- | gr-channels/lib/sro_model_impl.cc | 4 |
8 files changed, 27 insertions, 27 deletions
diff --git a/gr-channels/lib/cfo_model_impl.cc b/gr-channels/lib/cfo_model_impl.cc index 2ff85c3030..82aae7b528 100644 --- a/gr-channels/lib/cfo_model_impl.cc +++ b/gr-channels/lib/cfo_model_impl.cc @@ -21,8 +21,8 @@ cfo_model::sptr cfo_model::make(double sample_rate_hz, double max_dev_hz, double noise_seed) { - return gnuradio::get_initial_sptr( - new cfo_model_impl(sample_rate_hz, std_dev_hz, max_dev_hz, noise_seed)); + return gnuradio::make_block_sptr<cfo_model_impl>( + sample_rate_hz, std_dev_hz, max_dev_hz, noise_seed); } cfo_model_impl::cfo_model_impl(double sample_rate_hz, diff --git a/gr-channels/lib/channel_model2_impl.cc b/gr-channels/lib/channel_model2_impl.cc index d0d7be0be5..465e837675 100644 --- a/gr-channels/lib/channel_model2_impl.cc +++ b/gr-channels/lib/channel_model2_impl.cc @@ -22,8 +22,8 @@ channel_model2::sptr channel_model2::make(double noise_voltage, double noise_seed, bool block_tags) { - return gnuradio::get_initial_sptr( - new channel_model2_impl(noise_voltage, epsilon, taps, noise_seed, block_tags)); + return gnuradio::make_block_sptr<channel_model2_impl>( + noise_voltage, epsilon, taps, noise_seed, block_tags); } // Hierarchical block constructor diff --git a/gr-channels/lib/channel_model_impl.cc b/gr-channels/lib/channel_model_impl.cc index 52c16187fa..75a8e00eef 100644 --- a/gr-channels/lib/channel_model_impl.cc +++ b/gr-channels/lib/channel_model_impl.cc @@ -22,8 +22,8 @@ channel_model::sptr channel_model::make(double noise_voltage, double noise_seed, bool block_tags) { - return gnuradio::get_initial_sptr(new channel_model_impl( - noise_voltage, frequency_offset, epsilon, taps, noise_seed, block_tags)); + return gnuradio::make_block_sptr<channel_model_impl>( + noise_voltage, frequency_offset, epsilon, taps, noise_seed, block_tags); } // Hierarchical block constructor diff --git a/gr-channels/lib/dynamic_channel_model_impl.cc b/gr-channels/lib/dynamic_channel_model_impl.cc index e0ebe69cc8..dd15d2067f 100644 --- a/gr-channels/lib/dynamic_channel_model_impl.cc +++ b/gr-channels/lib/dynamic_channel_model_impl.cc @@ -30,20 +30,20 @@ dynamic_channel_model::sptr dynamic_channel_model::make(double samp_rate, double noise_amp, double noise_seed) { - return gnuradio::get_initial_sptr(new dynamic_channel_model_impl(samp_rate, - sro_std_dev, - sro_max_dev, - cfo_std_dev, - cfo_max_dev, - N, - doppler_freq, - LOS_model, - K, - delays, - mags, - ntaps_mpath, - noise_amp, - noise_seed)); + return gnuradio::make_block_sptr<dynamic_channel_model_impl>(samp_rate, + sro_std_dev, + sro_max_dev, + cfo_std_dev, + cfo_max_dev, + N, + doppler_freq, + LOS_model, + K, + delays, + mags, + ntaps_mpath, + noise_amp, + noise_seed); } // Hierarchical block constructor diff --git a/gr-channels/lib/fading_model_impl.cc b/gr-channels/lib/fading_model_impl.cc index 1832d15b24..0c037e9e7c 100644 --- a/gr-channels/lib/fading_model_impl.cc +++ b/gr-channels/lib/fading_model_impl.cc @@ -18,7 +18,7 @@ namespace channels { fading_model::sptr fading_model::make(unsigned int N, float fDTs, bool LOS, float K, uint32_t seed) { - return gnuradio::get_initial_sptr(new fading_model_impl(N, fDTs, LOS, K, seed)); + return gnuradio::make_block_sptr<fading_model_impl>(N, fDTs, LOS, K, seed); } // Block constructor diff --git a/gr-channels/lib/selective_fading_model2_impl.cc b/gr-channels/lib/selective_fading_model2_impl.cc index e094faa9b0..4f095646f2 100644 --- a/gr-channels/lib/selective_fading_model2_impl.cc +++ b/gr-channels/lib/selective_fading_model2_impl.cc @@ -34,8 +34,8 @@ selective_fading_model2::make(unsigned int N, std::vector<float> mags, unsigned int ntaps) { - return gnuradio::get_initial_sptr(new selective_fading_model2_impl( - N, fDTs, LOS, K, seed, delays, delays_std, delays_maxdev, mags, ntaps)); + return gnuradio::make_block_sptr<selective_fading_model2_impl>( + N, fDTs, LOS, K, seed, delays, delays_std, delays_maxdev, mags, ntaps); } // Block constructor diff --git a/gr-channels/lib/selective_fading_model_impl.cc b/gr-channels/lib/selective_fading_model_impl.cc index da9b2c3787..91b0c8d328 100644 --- a/gr-channels/lib/selective_fading_model_impl.cc +++ b/gr-channels/lib/selective_fading_model_impl.cc @@ -31,8 +31,8 @@ selective_fading_model::sptr selective_fading_model::make(unsigned int N, std::vector<float> mags, int ntaps) { - return gnuradio::get_initial_sptr( - new selective_fading_model_impl(N, fDTs, LOS, K, seed, delays, mags, ntaps)); + return gnuradio::make_block_sptr<selective_fading_model_impl>( + N, fDTs, LOS, K, seed, delays, mags, ntaps); } // Block constructor diff --git a/gr-channels/lib/sro_model_impl.cc b/gr-channels/lib/sro_model_impl.cc index 9be24a8cd0..0362ab3ca9 100644 --- a/gr-channels/lib/sro_model_impl.cc +++ b/gr-channels/lib/sro_model_impl.cc @@ -24,8 +24,8 @@ sro_model::sptr sro_model::make(double sample_rate_hz, double max_dev_hz, double noise_seed) { - return gnuradio::get_initial_sptr( - new sro_model_impl(sample_rate_hz, std_dev_hz, max_dev_hz, noise_seed)); + return gnuradio::make_block_sptr<sro_model_impl>( + sample_rate_hz, std_dev_hz, max_dev_hz, noise_seed); } sro_model_impl::sro_model_impl(double sample_rate_hz, |