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 /gnuradio-runtime/include/gnuradio/hier_block2.h | |
| 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 'gnuradio-runtime/include/gnuradio/hier_block2.h')
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/hier_block2.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gnuradio-runtime/include/gnuradio/hier_block2.h b/gnuradio-runtime/include/gnuradio/hier_block2.h index 69173becd6..fc81796a78 100644 --- a/gnuradio-runtime/include/gnuradio/hier_block2.h +++ b/gnuradio-runtime/include/gnuradio/hier_block2.h @@ -34,10 +34,8 @@ class GR_RUNTIME_API hier_block2 : public basic_block { private: friend class hier_block2_detail; - friend GR_RUNTIME_API hier_block2_sptr - make_hier_block2(const std::string& name, - gr::io_signature::sptr input_signature, - gr::io_signature::sptr output_signature); + template <typename T, typename... Args> + friend std::shared_ptr<T> gnuradio::make_block_sptr(Args&&... args); /*! * \brief Private implementation details of gr::hier_block2. |