summaryrefslogtreecommitdiff
path: root/gr-zeromq/lib
diff options
context:
space:
mode:
authorThomas Habets <thomas@habets.se>2020-05-03 12:23:51 +0100
committerMarcus Müller <marcus@hostalia.de>2020-07-30 18:12:44 +0200
commit30643f01609e915296023adc37123e27e2c86d3f (patch)
treecaf7141e8091cd30cde4e75ef0d1fcc5454ace77 /gr-zeromq/lib
parent875148321bca3c39af9aec8dee3c24eb9f75d1e6 (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-zeromq/lib')
-rw-r--r--gr-zeromq/lib/pub_msg_sink_impl.cc2
-rw-r--r--gr-zeromq/lib/pub_sink_impl.cc4
-rw-r--r--gr-zeromq/lib/pull_msg_source_impl.cc2
-rw-r--r--gr-zeromq/lib/pull_source_impl.cc4
-rw-r--r--gr-zeromq/lib/push_msg_sink_impl.cc2
-rw-r--r--gr-zeromq/lib/push_sink_impl.cc4
-rw-r--r--gr-zeromq/lib/rep_msg_sink_impl.cc2
-rw-r--r--gr-zeromq/lib/rep_sink_impl.cc4
-rw-r--r--gr-zeromq/lib/req_msg_source_impl.cc2
-rw-r--r--gr-zeromq/lib/req_source_impl.cc4
-rw-r--r--gr-zeromq/lib/sub_msg_source_impl.cc2
-rw-r--r--gr-zeromq/lib/sub_source_impl.cc4
12 files changed, 18 insertions, 18 deletions
diff --git a/gr-zeromq/lib/pub_msg_sink_impl.cc b/gr-zeromq/lib/pub_msg_sink_impl.cc
index 924b68a436..232597e814 100644
--- a/gr-zeromq/lib/pub_msg_sink_impl.cc
+++ b/gr-zeromq/lib/pub_msg_sink_impl.cc
@@ -21,7 +21,7 @@ namespace zeromq {
pub_msg_sink::sptr pub_msg_sink::make(char* address, int timeout, bool bind)
{
- return gnuradio::get_initial_sptr(new pub_msg_sink_impl(address, timeout, bind));
+ return gnuradio::make_block_sptr<pub_msg_sink_impl>(address, timeout, bind);
}
pub_msg_sink_impl::pub_msg_sink_impl(char* address, int timeout, bool bind)
diff --git a/gr-zeromq/lib/pub_sink_impl.cc b/gr-zeromq/lib/pub_sink_impl.cc
index 84a7364152..460484bc0d 100644
--- a/gr-zeromq/lib/pub_sink_impl.cc
+++ b/gr-zeromq/lib/pub_sink_impl.cc
@@ -27,8 +27,8 @@ pub_sink::sptr pub_sink::make(size_t itemsize,
int hwm,
const std::string& key)
{
- return gnuradio::get_initial_sptr(
- new pub_sink_impl(itemsize, vlen, address, timeout, pass_tags, hwm, key));
+ return gnuradio::make_block_sptr<pub_sink_impl>(
+ itemsize, vlen, address, timeout, pass_tags, hwm, key);
}
pub_sink_impl::pub_sink_impl(size_t itemsize,
diff --git a/gr-zeromq/lib/pull_msg_source_impl.cc b/gr-zeromq/lib/pull_msg_source_impl.cc
index 0520ba5abc..9a467e597f 100644
--- a/gr-zeromq/lib/pull_msg_source_impl.cc
+++ b/gr-zeromq/lib/pull_msg_source_impl.cc
@@ -23,7 +23,7 @@ namespace zeromq {
pull_msg_source::sptr pull_msg_source::make(char* address, int timeout, bool bind)
{
- return gnuradio::get_initial_sptr(new pull_msg_source_impl(address, timeout, bind));
+ return gnuradio::make_block_sptr<pull_msg_source_impl>(address, timeout, bind);
}
pull_msg_source_impl::pull_msg_source_impl(char* address, int timeout, bool bind)
diff --git a/gr-zeromq/lib/pull_source_impl.cc b/gr-zeromq/lib/pull_source_impl.cc
index 7d184eef38..bcde5aea15 100644
--- a/gr-zeromq/lib/pull_source_impl.cc
+++ b/gr-zeromq/lib/pull_source_impl.cc
@@ -22,8 +22,8 @@ namespace zeromq {
pull_source::sptr pull_source::make(
size_t itemsize, size_t vlen, char* address, int timeout, bool pass_tags, int hwm)
{
- return gnuradio::get_initial_sptr(
- new pull_source_impl(itemsize, vlen, address, timeout, pass_tags, hwm));
+ return gnuradio::make_block_sptr<pull_source_impl>(
+ itemsize, vlen, address, timeout, pass_tags, hwm);
}
pull_source_impl::pull_source_impl(
diff --git a/gr-zeromq/lib/push_msg_sink_impl.cc b/gr-zeromq/lib/push_msg_sink_impl.cc
index f43cf9d487..b32bea620b 100644
--- a/gr-zeromq/lib/push_msg_sink_impl.cc
+++ b/gr-zeromq/lib/push_msg_sink_impl.cc
@@ -21,7 +21,7 @@ namespace zeromq {
push_msg_sink::sptr push_msg_sink::make(char* address, int timeout, bool bind)
{
- return gnuradio::get_initial_sptr(new push_msg_sink_impl(address, timeout, bind));
+ return gnuradio::make_block_sptr<push_msg_sink_impl>(address, timeout, bind);
}
push_msg_sink_impl::push_msg_sink_impl(char* address, int timeout, bool bind)
diff --git a/gr-zeromq/lib/push_sink_impl.cc b/gr-zeromq/lib/push_sink_impl.cc
index 576dc76017..fb3d3f323a 100644
--- a/gr-zeromq/lib/push_sink_impl.cc
+++ b/gr-zeromq/lib/push_sink_impl.cc
@@ -22,8 +22,8 @@ namespace zeromq {
push_sink::sptr push_sink::make(
size_t itemsize, size_t vlen, char* address, int timeout, bool pass_tags, int hwm)
{
- return gnuradio::get_initial_sptr(
- new push_sink_impl(itemsize, vlen, address, timeout, pass_tags, hwm));
+ return gnuradio::make_block_sptr<push_sink_impl>(
+ itemsize, vlen, address, timeout, pass_tags, hwm);
}
push_sink_impl::push_sink_impl(
diff --git a/gr-zeromq/lib/rep_msg_sink_impl.cc b/gr-zeromq/lib/rep_msg_sink_impl.cc
index 5bf7d634ce..5496d26253 100644
--- a/gr-zeromq/lib/rep_msg_sink_impl.cc
+++ b/gr-zeromq/lib/rep_msg_sink_impl.cc
@@ -21,7 +21,7 @@ namespace zeromq {
rep_msg_sink::sptr rep_msg_sink::make(char* address, int timeout, bool bind)
{
- return gnuradio::get_initial_sptr(new rep_msg_sink_impl(address, timeout, bind));
+ return gnuradio::make_block_sptr<rep_msg_sink_impl>(address, timeout, bind);
}
rep_msg_sink_impl::rep_msg_sink_impl(char* address, int timeout, bool bind)
diff --git a/gr-zeromq/lib/rep_sink_impl.cc b/gr-zeromq/lib/rep_sink_impl.cc
index c04864da7a..7f207f53ad 100644
--- a/gr-zeromq/lib/rep_sink_impl.cc
+++ b/gr-zeromq/lib/rep_sink_impl.cc
@@ -22,8 +22,8 @@ namespace zeromq {
rep_sink::sptr rep_sink::make(
size_t itemsize, size_t vlen, char* address, int timeout, bool pass_tags, int hwm)
{
- return gnuradio::get_initial_sptr(
- new rep_sink_impl(itemsize, vlen, address, timeout, pass_tags, hwm));
+ return gnuradio::make_block_sptr<rep_sink_impl>(
+ itemsize, vlen, address, timeout, pass_tags, hwm);
}
rep_sink_impl::rep_sink_impl(
diff --git a/gr-zeromq/lib/req_msg_source_impl.cc b/gr-zeromq/lib/req_msg_source_impl.cc
index d55829a815..a1d2bf76f7 100644
--- a/gr-zeromq/lib/req_msg_source_impl.cc
+++ b/gr-zeromq/lib/req_msg_source_impl.cc
@@ -23,7 +23,7 @@ namespace zeromq {
req_msg_source::sptr req_msg_source::make(char* address, int timeout, bool bind)
{
- return gnuradio::get_initial_sptr(new req_msg_source_impl(address, timeout, bind));
+ return gnuradio::make_block_sptr<req_msg_source_impl>(address, timeout, bind);
}
req_msg_source_impl::req_msg_source_impl(char* address, int timeout, bool bind)
diff --git a/gr-zeromq/lib/req_source_impl.cc b/gr-zeromq/lib/req_source_impl.cc
index fb1f28b75b..b200ed076c 100644
--- a/gr-zeromq/lib/req_source_impl.cc
+++ b/gr-zeromq/lib/req_source_impl.cc
@@ -22,8 +22,8 @@ namespace zeromq {
req_source::sptr req_source::make(
size_t itemsize, size_t vlen, char* address, int timeout, bool pass_tags, int hwm)
{
- return gnuradio::get_initial_sptr(
- new req_source_impl(itemsize, vlen, address, timeout, pass_tags, hwm));
+ return gnuradio::make_block_sptr<req_source_impl>(
+ itemsize, vlen, address, timeout, pass_tags, hwm);
}
req_source_impl::req_source_impl(
diff --git a/gr-zeromq/lib/sub_msg_source_impl.cc b/gr-zeromq/lib/sub_msg_source_impl.cc
index 281c5b1995..d5b06b4df1 100644
--- a/gr-zeromq/lib/sub_msg_source_impl.cc
+++ b/gr-zeromq/lib/sub_msg_source_impl.cc
@@ -23,7 +23,7 @@ namespace zeromq {
sub_msg_source::sptr sub_msg_source::make(char* address, int timeout, bool bind)
{
- return gnuradio::get_initial_sptr(new sub_msg_source_impl(address, timeout, bind));
+ return gnuradio::make_block_sptr<sub_msg_source_impl>(address, timeout, bind);
}
sub_msg_source_impl::sub_msg_source_impl(char* address, int timeout, bool bind)
diff --git a/gr-zeromq/lib/sub_source_impl.cc b/gr-zeromq/lib/sub_source_impl.cc
index 7fe5eabc3c..ddc2eb7ad8 100644
--- a/gr-zeromq/lib/sub_source_impl.cc
+++ b/gr-zeromq/lib/sub_source_impl.cc
@@ -27,8 +27,8 @@ sub_source::sptr sub_source::make(size_t itemsize,
int hwm,
const std::string& key)
{
- return gnuradio::get_initial_sptr(
- new sub_source_impl(itemsize, vlen, address, timeout, pass_tags, hwm, key));
+ return gnuradio::make_block_sptr<sub_source_impl>(
+ itemsize, vlen, address, timeout, pass_tags, hwm, key);
}
sub_source_impl::sub_source_impl(size_t itemsize,
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-22 05:45:56 +0000