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-blocks/lib/qa_gr_hier_block2_derived.cc | |
| 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-blocks/lib/qa_gr_hier_block2_derived.cc')
| -rw-r--r-- | gr-blocks/lib/qa_gr_hier_block2_derived.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gr-blocks/lib/qa_gr_hier_block2_derived.cc b/gr-blocks/lib/qa_gr_hier_block2_derived.cc index b2af4921c6..a1a0ede624 100644 --- a/gr-blocks/lib/qa_gr_hier_block2_derived.cc +++ b/gr-blocks/lib/qa_gr_hier_block2_derived.cc @@ -29,7 +29,9 @@ gr_derived_block_sptr gr_make_derived_block(); class gr_derived_block : public gr::hier_block2 { private: - friend gr_derived_block_sptr gr_make_derived_block(); + template <typename T, typename... Args> + friend std::shared_ptr<T> gnuradio::make_block_sptr(Args&&... args); + gr_derived_block(); public: @@ -39,7 +41,7 @@ public: gr_derived_block_sptr gr_make_derived_block() { - return gnuradio::get_initial_sptr(new gr_derived_block()); + return gnuradio::make_block_sptr<gr_derived_block>(); } gr_derived_block::gr_derived_block() |